X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2a8d349eaf2b1ac2254056ea32859f72a226d63f..2cf42c27a7e8b37e29462d0b695e24cb6f3ad5ce:/sdk/go/arvadosclient/arvadosclient_test.go

diff --git a/sdk/go/arvadosclient/arvadosclient_test.go b/sdk/go/arvadosclient/arvadosclient_test.go
index ca1d93319d..d8bec398b8 100644
--- a/sdk/go/arvadosclient/arvadosclient_test.go
+++ b/sdk/go/arvadosclient/arvadosclient_test.go
@@ -1,11 +1,10 @@
 package arvadosclient
 
 import (
-	"fmt"
 	. "gopkg.in/check.v1"
+	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
 	"net/http"
 	"os"
-	"os/exec"
 	"testing"
 )
 
@@ -19,47 +18,35 @@ var _ = Suite(&ServerRequiredSuite{})
 // Tests that require the Keep server running
 type ServerRequiredSuite struct{}
 
-func pythonDir() string {
-	cwd, _ := os.Getwd()
-	return fmt.Sprintf("%s/../../python/tests", cwd)
-}
-
 func (s *ServerRequiredSuite) SetUpSuite(c *C) {
-	os.Chdir(pythonDir())
-	if err := exec.Command("python", "run_test_server.py", "start").Run(); err != nil {
-		panic("'python run_test_server.py start' returned error")
-	}
-	if err := exec.Command("python", "run_test_server.py", "start_keep").Run(); err != nil {
-		panic("'python run_test_server.py start_keep' returned error")
-	}
+	arvadostest.StartAPI()
+	arvadostest.StartKeep()
 }
 
-func (s *ServerRequiredSuite) TestMakeArvadosClient(c *C) {
-	os.Setenv("ARVADOS_API_HOST", "localhost:3000")
-	os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
-	os.Setenv("ARVADOS_API_HOST_INSECURE", "")
+func (s *ServerRequiredSuite) SetUpTest(c *C) {
+	arvadostest.ResetEnv()
+}
 
+func (s *ServerRequiredSuite) TestMakeArvadosClientSecure(c *C) {
+	os.Unsetenv("ARVADOS_API_HOST_INSECURE")
 	kc, err := MakeArvadosClient()
-	c.Check(kc.ApiServer, Equals, "localhost:3000")
-	c.Check(kc.ApiToken, Equals, "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
+	c.Assert(err, Equals, nil)
+	c.Check(kc.ApiServer, Equals, os.Getenv("ARVADOS_API_HOST"))
+	c.Check(kc.ApiToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
 	c.Check(kc.ApiInsecure, Equals, false)
+}
 
+func (s *ServerRequiredSuite) TestMakeArvadosClientInsecure(c *C) {
 	os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
-
-	kc, err = MakeArvadosClient()
-	c.Check(kc.ApiServer, Equals, "localhost:3000")
-	c.Check(kc.ApiToken, Equals, "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
+	kc, err := MakeArvadosClient()
+	c.Assert(err, Equals, nil)
 	c.Check(kc.ApiInsecure, Equals, true)
+	c.Check(kc.ApiServer, Equals, os.Getenv("ARVADOS_API_HOST"))
+	c.Check(kc.ApiToken, Equals, os.Getenv("ARVADOS_API_TOKEN"))
 	c.Check(kc.Client.Transport.(*http.Transport).TLSClientConfig.InsecureSkipVerify, Equals, true)
-
-	c.Assert(err, Equals, nil)
 }
 
 func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
-	os.Setenv("ARVADOS_API_HOST", "localhost:3000")
-	os.Setenv("ARVADOS_API_TOKEN", "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h")
-	os.Setenv("ARVADOS_API_HOST_INSECURE", "true")
-
 	arv, err := MakeArvadosClient()
 
 	getback := make(Dict)
@@ -89,3 +76,27 @@ func (s *ServerRequiredSuite) TestCreatePipelineTemplate(c *C) {
 	c.Assert(err, Equals, nil)
 	c.Assert(getback["name"], Equals, "tmp2")
 }
+
+func (s *ServerRequiredSuite) TestErrorResponse(c *C) {
+	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)
+	}
+}