4823: Another merge conflict test.

[arvados.git] / sdk / go / arvadosclient / arvadosclient_test.go

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index 678c53310e359c8e8783b5652c9ad6c7bff1e3c9..bf9b4e31c41dbb5ba974e1da3b4d1dbb99cda7e3 100644 (file)
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -35,19 +35,19 @@ func (s *ServerRequiredSuite) SetUpSuite(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestMakeArvadosClient(c *C) {
-       os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+       os.Setenv("ARVADOS_API_HOST", "localhost:3000")
        os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
        os.Setenv("ARVADOS_API_HOST_INSECURE", "")
 
        kc, err := MakeArvadosClient()
-       c.Check(kc.ApiServer, Equals, "localhost:3001")
+       c.Check(kc.ApiServer, Equals, "localhost:3000")
        c.Check(kc.ApiToken, Equals, "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
        c.Check(kc.ApiInsecure, Equals, false)
 
        os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
 
        kc, err = MakeArvadosClient()
-       c.Check(kc.ApiServer, Equals, "localhost:3001")
+       c.Check(kc.ApiServer, Equals, "localhost:3000")
        c.Check(kc.ApiToken, Equals, "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
        c.Check(kc.ApiInsecure, Equals, true)
        c.Check(kc.Client.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify, Equals, true)
@@ -56,7 +56,7 @@ func (s *ServerRequiredSuite) TestMakeArvadosClient(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
-       os.Setenv("ARVADOS_API_HOST", "localhost:3001")
+       os.Setenv("ARVADOS_API_HOST", "localhost:3000")
        os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
        os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
 
@@ -89,3 +89,31 @@ func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
        c.Assert(err, Equals, nil)
        c.Assert(getback["name"], Equals, "tmp2")
 }
+
+func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
+       os.Setenv("ARVADOS_API_HOST", "localhost:3000")
+       os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
+       os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
+
+       arv, _ := MakeArvadosClient()
+
+       getback := make(Dict)
+
+       {
+               err := arv.Create("logs",
+                       Dict{"log": Dict{"bogus_attr": "foo"}},
+                       &getback)
+               c.Assert(err, ErrorMatches, ".*unknown attribute: bogus_attr.*")
+               c.Assert(err, FitsTypeOf, ArvadosApiError{})
+               c.Assert(err.(ArvadosApiError).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)
+       }
+}