X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6c14ca8fe128f4db3bafe4edd1cc5551bc85e1ef..deba5b86b2e0c41d18d6f9f7bd72f18755ed7a81:/sdk/go/arvadosclient/arvadosclient_test.go

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index 97c9b184e7..6a9e13bb27 100644
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -86,31 +86,33 @@ func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
 		err := arv.Create("logs",
 			Dict{"log": Dict{"bogus_attr": "foo"}},
 			&getback)
+		c.Assert(err, ErrorMatches, "arvados API server error: .*")
 		c.Assert(err, ErrorMatches, ".*unknown attribute: bogus_attr.*")
-		c.Assert(err, FitsTypeOf, ArvadosApiError{})
-		c.Assert(err.(ArvadosApiError).HttpStatusCode, Equals, 422)
+		c.Assert(err, FitsTypeOf, APIServerError{})
+		c.Assert(err.(APIServerError).HttpStatusCode, Equals, 422)
 	}
 
 	{
 		err := arv.Create("bogus",
 			Dict{"bogus": Dict{}},
 			&getback)
-		c.Assert(err, ErrorMatches, "Path not found")
-		c.Assert(err, FitsTypeOf, ArvadosApiError{})
-		c.Assert(err.(ArvadosApiError).HttpStatusCode, Equals, 404)
+		c.Assert(err, ErrorMatches, "arvados API server error: .*")
+		c.Assert(err, ErrorMatches, ".*Path not found.*")
+		c.Assert(err, FitsTypeOf, APIServerError{})
+		c.Assert(err.(APIServerError).HttpStatusCode, Equals, 404)
 	}
 }
 
-func (s *ServerRequiredSuite) TestAPIDiscovery_Get_defaultTrashLifetime(c *C) {
+func (s *ServerRequiredSuite) TestAPIDiscovery_Get_defaultCollectionReplication(c *C) {
 	arv, err := MakeArvadosClient()
-	valueMap, err := arv.Discovery("defaultTrashLifetime")
+	value, err := arv.Discovery("defaultCollectionReplication")
 	c.Assert(err, IsNil)
-	c.Assert(valueMap["defaultTrashLifetime"], NotNil)
+	c.Assert(value, NotNil)
 }
 
 func (s *ServerRequiredSuite) TestAPIDiscovery_Get_noSuchParameter(c *C) {
 	arv, err := MakeArvadosClient()
-	valueMap, err := arv.Discovery("noSuchParameter")
-	c.Assert(err, IsNil)
-	c.Assert(valueMap["noSuchParameter"], IsNil)
+	value, err := arv.Discovery("noSuchParameter")
+	c.Assert(err, NotNil)
+	c.Assert(value, IsNil)
 }