[ARVADOS] updated: da453701654115387e6b11189c6a830f24abf715

git at public.curoverse.com git at public.curoverse.com
Tue Oct 20 11:41:14 EDT 2015


Summary of changes:
 .../_getting_started_popup.html.erb                |   2 +-
 sdk/python/arvados/keep.py                         |  33 +++-
 sdk/python/tests/test_keep_client.py               | 193 +++++++++++++--------
 tools/keep-rsync/keep-rsync_test.go                |   2 +-
 4 files changed, 155 insertions(+), 75 deletions(-)

       via  da453701654115387e6b11189c6a830f24abf715 (commit)
       via  9a2bed0f3878e1332f800987292f9ec4316bd9a7 (commit)
       via  d379c467be58c66b2f1e7acafc97634b269a1542 (commit)
       via  6de9152319167bb32602501e02e18a89e333336d (commit)
       via  f2691496d53aa6367d4b777b67881b05b50ed85f (commit)
       via  25af384efacda9f3c552eebfee42e14b785e9a16 (commit)
      from  b534fd13b3446067ddf6f8bd3c5b19c3463bc655 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit da453701654115387e6b11189c6a830f24abf715
Merge: 9a2bed0 d379c46
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 20 11:41:07 2015 -0400

    Merge branch 'master' into 7492-keepproxy-upstream-errors


commit 9a2bed0f3878e1332f800987292f9ec4316bd9a7
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 20 11:40:05 2015 -0400

    7492: update keep-rsync test with bad blob signing key to expect Forbidden error instead of Block not found error.

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index 6fbb535..60bc90a 100644
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -352,7 +352,7 @@ func (s *ServerRequiredSuite) TestErrorDuringRsync_ErrorGettingBlockFromSrc(c *C
 	blobSigningKey = "thisisfakeblobsigningkey"
 
 	err := performKeepRsync(kcSrc, kcDst, blobSigningKey, "")
-	c.Check(strings.HasSuffix(err.Error(), "Block not found"), Equals, true)
+	c.Check(strings.Contains(err.Error(), "HTTP 403 \"Forbidden\""), Equals, true)
 }
 
 // Test rsync with error during Put to src.

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list