[ARVADOS] updated: 5da8705c0633e8a79b00ceab5904eb4c632963d3

[git at public.curoverse.com]

Summary of changes:
 sdk/go/keepclient/keepclient_test.go |  3 +++
 sdk/python/tests/nginx.conf          |  2 +-
 sdk/python/tests/run_test_server.py  | 21 +++++++++++++++------
 3 files changed, 19 insertions(+), 7 deletions(-)

       via  5da8705c0633e8a79b00ceab5904eb4c632963d3 (commit)
       via  5f93585b16f2b5ac9c2e86f8dea876b310cbcf57 (commit)
       via  3da10f0c0f5a0c0c91d49436a5995c890b03d228 (commit)
       via  6b1b4d80445f0e03f89c46a167bebefe7bcf97c0 (commit)
       via  329da35b297dc38f3f32198ed1c7e09bbace7c0e (commit)
       via  716d6859bda672865c1266818bbc9814cfa9e64e (commit)
       via  89b0d40ef05354a2b298a96ec3fc7a879f7f5328 (commit)
      from  3d4717f6f48957d58d46fa0ecb4e65e3f49b1858 (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 5da8705c0633e8a79b00ceab5904eb4c632963d3
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 20 13:41:29 2015 -0400

    7546: update some of the failure tests to use keepclient.Retries = 0, so that the tests do not waste too much time
    retrying a test that is designed for failures. This update brings down the keepclient_test runtime from 49s to 10s.

diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 2ff1819..c03ba90 100644
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -442,6 +442,7 @@ func (s *StandaloneSuite) TestPutWithTooManyFail(c *C) {
 	kc, _ := MakeKeepClient(&arv)
 
 	kc.Want_replicas = 2
+	kc.Retries = 0
 	arv.ApiToken = "abc123"
 	localRoots := make(map[string]string)
 	writableLocalRoots := make(map[string]string)
@@ -552,6 +553,7 @@ func (s *StandaloneSuite) TestGetFail(c *C) {
 	kc, _ := MakeKeepClient(&arv)
 	arv.ApiToken = "abc123"
 	kc.SetServiceRoots(map[string]string{"x": ks.url}, nil, nil)
+	kc.Retries = 0
 
 	r, n, url2, err := kc.Get(hash)
 	c.Check(err, Equals, BlockNotFound)
@@ -808,6 +810,7 @@ func (s *StandaloneSuite) TestGetWithFailures(c *C) {
 	}
 
 	kc.SetServiceRoots(localRoots, writableLocalRoots, nil)
+	kc.Retries = 0
 
 	// This test works only if one of the failing services is
 	// attempted before the succeeding service. Otherwise,

commit 5f93585b16f2b5ac9c2e86f8dea876b310cbcf57
Merge: 3d4717f 3da10f0
Author: radhika <radhika at curoverse.com>
Date:   Tue Oct 20 13:30:45 2015 -0400

    Merge branch 'master' into 7546-put-retry


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


hooks/post-receive
--