X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/6c0bf267d795a3ca49c3258c9490714c9e18d333..12495b9c8e1cbde47d0a96c021d96141c51f10d8:/sdk/go/arvadostest/run_servers.go

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index d3b48ea9fb..490a7f3e03 100644
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -1,3 +1,7 @@
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+
 package arvadostest
 
 import (
@@ -62,6 +66,9 @@ func chdirToPythonTests() {
 	for {
 		if err := os.Chdir("sdk/python/tests"); err == nil {
 			pythonTestDir, err = os.Getwd()
+			if err != nil {
+				log.Fatal(err)
+			}
 			return
 		}
 		if parent, err := os.Getwd(); err != nil || parent == "/" {
@@ -97,7 +104,10 @@ func StopAPI() {
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
-	bgRun(exec.Command("python", "run_test_server.py", "stop"))
+	cmd := exec.Command("python", "run_test_server.py", "stop")
+	bgRun(cmd)
+	// Without Wait, "go test" in go1.10.1 tends to hang. https://github.com/golang/go/issues/24050
+	cmd.Wait()
 }
 
 // StartKeep starts the given number of keep servers,
@@ -125,12 +135,9 @@ func StopKeep(numKeepServers int) {
 	chdirToPythonTests()
 
 	cmd := exec.Command("python", "run_test_server.py", "stop_keep", "--num-keep-servers", strconv.Itoa(numKeepServers))
-	cmd.Stdin = nil
-	cmd.Stderr = os.Stderr
-	cmd.Stdout = os.Stderr
-	if err := cmd.Run(); err != nil {
-		log.Fatalf("%+v: %s", cmd.Args, err)
-	}
+	bgRun(cmd)
+	// Without Wait, "go test" in go1.10.1 tends to hang. https://github.com/golang/go/issues/24050
+	cmd.Wait()
 }
 
 // Start cmd, with stderr and stdout redirected to our own