From: radhika <radhika@curoverse.com>
Date: Fri, 23 Oct 2015 13:44:47 +0000 (-0400)
Subject: Merge branch 'master' into 7492-keepproxy-upstream-errors
X-Git-Tag: 1.1.0~1282^2~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f5ab6191a96ce31defe0269b9bc739c6492c1a90

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

f5ab6191a96ce31defe0269b9bc739c6492c1a90
diff --cc sdk/go/keepclient/keepclient_test.go
index 3714a544fc,c03ba90736..ddfb20ec75
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@@ -553,11 -553,10 +554,12 @@@ func (s *StandaloneSuite) TestGetFail(
  	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)
 +	errNotFound, _ := err.(ErrNotFound)
 +	c.Check(errNotFound, NotNil)
 +	c.Check(strings.Contains(err.Error(), "use of closed network connection"), Equals, true)
  	c.Check(n, Equals, int64(0))
  	c.Check(url2, Equals, "")
  	c.Check(r, Equals, nil)