X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d47c009c2afd20b86cca083787d238c136e70abd..740137a2d5a73bb6e6e3dc21a8e183a285fc8e24:/services/keepproxy/keepproxy_test.go

diff --git a/services/keepproxy/keepproxy_test.go b/services/keepproxy/keepproxy_test.go
index 22b1f30f73..c4e5ae7258 100644
--- a/services/keepproxy/keepproxy_test.go
+++ b/services/keepproxy/keepproxy_test.go
@@ -1,8 +1,8 @@
 package main
 
 import (
-	keepclient "git.curoverse.com/arvados.git/sdk/go/keepclient"
-	arvadosclient "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
+	"git.curoverse.com/arvados.git/sdk/go/keepclient"
+	"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
 	"crypto/md5"
 	"crypto/tls"
 	"fmt"
@@ -39,12 +39,27 @@ func (s *ServerRequiredSuite) SetUpSuite(c *C) {
 	defer os.Chdir(cwd)
 
 	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")
+	{
+		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))
+		}
 	}
-	if err := exec.Command("python", "run_test_server.py", "start_keep").Run(); err != nil {
-		panic("'python run_test_server.py start_keep' returned error")
+	{
+		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)
+		}
+		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))
+		}
 	}
 
 	os.Setenv("ARVADOS_API_HOST", "localhost:3001")
@@ -155,7 +170,7 @@ func (s *ServerRequiredSuite) TestPutAskGet(c *C) {
 		var rep int
 		var err error
 		hash2, rep, err = kc.PutB([]byte("foo"))
-		c.Check(hash2, Equals, fmt.Sprintf("%s+3", hash))
+		c.Check(hash2, Matches, fmt.Sprintf(`^%s\+3(\+.+)?$`, hash))
 		c.Check(rep, Equals, 2)
 		c.Check(err, Equals, nil)
 		log.Print("PutB")
@@ -237,7 +252,7 @@ func (s *ServerRequiredSuite) TestGetDisabled(c *C) {
 
 	{
 		hash2, rep, err := kc.PutB([]byte("baz"))
-		c.Check(hash2, Equals, fmt.Sprintf("%s+3", hash))
+		c.Check(hash2, Matches, fmt.Sprintf(`^%s\+3(\+.+)?$`, hash))
 		c.Check(rep, Equals, 2)
 		c.Check(err, Equals, nil)
 		log.Print("PutB")