Merge branch 'master' into 7167-keep-rsync

[arvados.git] / sdk / go / arvadostest / run_servers.go

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index cad16917dba286504f6693cac3a3fbd4d05a741e..a1751361642de4a663f50612475a2ede82fc6f82 100644 (file)
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -99,11 +99,18 @@ func StopAPI() {
 }
 
 func StartKeep() {
+       StartKeepAdditional(false)
+}
+
+func StartKeepAdditional(keepExisting bool) {
        cwd, _ := os.Getwd()
        defer os.Chdir(cwd)
        chdirToPythonTests()
 
        cmd := exec.Command("python", "run_test_server.py", "start_keep")
+       if keepExisting {
+               cmd = exec.Command("python", "run_test_server.py", "start_keep", "--keep_existing", "true")
+       }
        stderr, err := cmd.StderrPipe()
        if err != nil {
                log.Fatalf("Setting up stderr pipe: %s", err)