[ARVADOS] updated: 1.1.4-175-ga221be6

Git user git at public.curoverse.com
Thu Apr 26 17:02:36 EDT 2018


Summary of changes:
 sdk/go/arvadostest/run_servers.go | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

       via  a221be676f0650993e76a9e402b93fa4ef7b5cf6 (commit)
      from  552c153523f55886867e54bad5db5eff166d0709 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit a221be676f0650993e76a9e402b93fa4ef7b5cf6
Author: Tom Clegg <tclegg at veritasgenetics.com>
Date:   Thu Apr 26 16:51:53 2018 -0400

    Avoid dangling child procs in test suite.
    
    In go 1.10.1, these seem to make "go test" hang sometimes.
    
    https://github.com/golang/go/issues/24050
    
    No issue #
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg at veritasgenetics.com>

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index dcc2fb0..490a7f3 100644
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -104,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,
@@ -132,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

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list