X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/cb48eb95d516b1d4a1ffe18be34703005531117a..db868a3c02cb84f068de77b438b4f2cb498826ae:/sdk/go/arvadostest/run_servers.go?ds=sidebyside

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index a175136164..e922104aeb 100644
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -9,6 +9,7 @@ import (
 	"log"
 	"os"
 	"os/exec"
+	"strconv"
 	"strings"
 )
 
@@ -98,19 +99,25 @@ func StopAPI() {
 	exec.Command("python", "run_test_server.py", "stop").Run()
 }
 
+// StartKeep starts 2 keep servers with enforcePermissions=false
 func StartKeep() {
-	StartKeepAdditional(false)
+	StartKeepWithParams(2, false)
 }
 
-func StartKeepAdditional(keepExisting bool) {
+// StartKeepWithParams starts the given number of keep servers,
+// optionally with -enforce-permissions enabled.
+func StartKeepWithParams(numKeepServers int, enforcePermissions 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")
+	cmdArgs := []string{"run_test_server.py", "start_keep", "--num-keep-servers", strconv.Itoa(numKeepServers)}
+	if enforcePermissions {
+		cmdArgs = append(cmdArgs, "--keep-enforce-permissions")
 	}
+
+	cmd := exec.Command("python", cmdArgs...)
+
 	stderr, err := cmd.StderrPipe()
 	if err != nil {
 		log.Fatalf("Setting up stderr pipe: %s", err)
@@ -122,9 +129,16 @@ func StartKeepAdditional(keepExisting bool) {
 }
 
 func StopKeep() {
+	StopKeepWithParams(2)
+}
+
+// StopKeepServers stops keep servers that were started with
+// StartKeep. numkeepServers should be the same value that was passed
+// to StartKeep.
+func StopKeepWithParams(numKeepServers int) {
 	cwd, _ := os.Getwd()
 	defer os.Chdir(cwd)
 	chdirToPythonTests()
 
-	exec.Command("python", "run_test_server.py", "stop_keep").Run()
+	exec.Command("python", "run_test_server.py", "stop_keep", "--num-keep-servers", strconv.Itoa(numKeepServers))
 }