3889: Since all failing API server functional tests are fixed, update test_helper...

[arvados.git] / sdk / go / keepclient / keepclient_test.go

diff --git a/sdk/go/keepclient/keepclient_test.go b/sdk/go/keepclient/keepclient_test.go
index 5327fb507e9b6de8a323fc9be8738d7d26b6595e..04be03baa415e3f294b921f7d59d1f65c8bb9ccb 100644 (file)
--- a/sdk/go/keepclient/keepclient_test.go
+++ b/sdk/go/keepclient/keepclient_test.go
@@ -1,8 +1,8 @@
 package keepclient
 
 import (
-       "arvados.org/sdk"
-       "arvados.org/streamer"
+       "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+       "git.curoverse.com/arvados.git/sdk/go/streamer"
        "crypto/md5"
        "flag"
        "fmt"
@@ -14,7 +14,6 @@ import (
        "net/http"
        "os"
        "os/exec"
-       "strings"
        "testing"
 )
 
@@ -36,20 +35,36 @@ type ServerRequiredSuite struct{}
 type StandaloneSuite struct{}
 
 func pythonDir() string {
-       gopath := os.Getenv("GOPATH")
-       return fmt.Sprintf("%s/../python/tests", strings.Split(gopath, ":")[0])
+       cwd, _ := os.Getwd()
+       return fmt.Sprintf("%s/../../python/tests", cwd)
 }
 
 func (s *ServerRequiredSuite) SetUpSuite(c *C) {
        if *no_server {
                c.Skip("Skipping tests that require server")
-       } else {
-               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")
+               return
+       }
+       os.Chdir(pythonDir())
+       {
+               cmd := exec.Command("python", "run_test_server.py", "start")
+               stderr, err := cmd.StderrPipe()
+               if err != nil {
+                       log.Fatalf("Setting up stderr pipe: %s", err)
+               }
+               go io.Copy(os.Stderr, stderr)
+               if err := cmd.Run(); err != nil {
+                       panic(fmt.Sprintf("'python run_test_server.py start' returned error %s", err))
+               }
+       }
+       {
+               cmd := exec.Command("python", "run_test_server.py", "start_keep")
+               stderr, err := cmd.StderrPipe()
+               if err != nil {
+                       log.Fatalf("Setting up stderr pipe: %s", err)
                }
-               if err := exec.Command("python", "run_test_server.py", "start_keep").Run(); err != nil {
-                       panic("'python run_test_server.py start_keep' returned error")
+               go io.Copy(os.Stderr, stderr)
+               if err := cmd.Run(); err != nil {
+                       panic(fmt.Sprintf("'python run_test_server.py start_keep' returned error %s", err))
                }
        }
 }
@@ -61,11 +76,11 @@ func (s *ServerRequiredSuite) TearDownSuite(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestMakeKeepClient(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")
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        c.Assert(err, Equals, nil)
 
        kc, err := MakeKeepClient(&arv)
@@ -126,7 +141,7 @@ func UploadToStubHelper(c *C, st http.Handler, f func(KeepClient, string,
        listener, url := RunBogusKeepServer(st, 2990)
        defer listener.Close()
 
-       arv, _ := sdk.MakeArvadosClient()
+       arv, _ := arvadosclient.MakeArvadosClient()
        arv.ApiToken = "abc123"
 
        kc, _ := MakeKeepClient(&arv)
@@ -260,7 +275,7 @@ func (s *StandaloneSuite) TestPutB(c *C) {
                "foo",
                make(chan string, 2)}
 
-       arv, _ := sdk.MakeArvadosClient()
+       arv, _ := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
 
        kc.Want_replicas = 2
@@ -302,7 +317,7 @@ func (s *StandaloneSuite) TestPutHR(c *C) {
                "foo",
                make(chan string, 2)}
 
-       arv, _ := sdk.MakeArvadosClient()
+       arv, _ := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
 
        kc.Want_replicas = 2
@@ -356,7 +371,7 @@ func (s *StandaloneSuite) TestPutWithFail(c *C) {
        fh := FailHandler{
                make(chan string, 1)}
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
 
        kc.Want_replicas = 2
@@ -405,7 +420,7 @@ func (s *StandaloneSuite) TestPutWithTooManyFail(c *C) {
        fh := FailHandler{
                make(chan string, 4)}
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
 
        kc.Want_replicas = 2
@@ -465,7 +480,7 @@ func (s *StandaloneSuite) TestGet(c *C) {
        listener, url := RunBogusKeepServer(st, 2990)
        defer listener.Close()
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
        arv.ApiToken = "abc123"
        kc.SetServiceRoots([]string{url})
@@ -491,7 +506,7 @@ func (s *StandaloneSuite) TestGetFail(c *C) {
        listener, url := RunBogusKeepServer(st, 2990)
        defer listener.Close()
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
        arv.ApiToken = "abc123"
        kc.SetServiceRoots([]string{url})
@@ -521,7 +536,7 @@ func (s *StandaloneSuite) TestChecksum(c *C) {
        listener, url := RunBogusKeepServer(st, 2990)
        defer listener.Close()
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
        arv.ApiToken = "abc123"
        kc.SetServiceRoots([]string{url})
@@ -554,7 +569,7 @@ func (s *StandaloneSuite) TestGetWithFailures(c *C) {
                "abc123",
                []byte("foo")}
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
        arv.ApiToken = "abc123"
        service_roots := make([]string, 5)
@@ -585,11 +600,11 @@ func (s *StandaloneSuite) TestGetWithFailures(c *C) {
 }
 
 func (s *ServerRequiredSuite) TestPutGetHead(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")
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, err := MakeKeepClient(&arv)
        c.Assert(err, Equals, nil)
 
@@ -638,7 +653,7 @@ func (s *StandaloneSuite) TestPutProxy(c *C) {
 
        st := StubProxyHandler{make(chan string, 1)}
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
 
        kc.Want_replicas = 2
@@ -669,7 +684,7 @@ func (s *StandaloneSuite) TestPutProxyInsufficientReplicas(c *C) {
 
        st := StubProxyHandler{make(chan string, 1)}
 
-       arv, err := sdk.MakeArvadosClient()
+       arv, err := arvadosclient.MakeArvadosClient()
        kc, _ := MakeKeepClient(&arv)
 
        kc.Want_replicas = 3