7167: add --keep-enforce-permissions to run_test_servers.py

diff --git a/sdk/go/arvadostest/run_servers.go b/sdk/go/arvadostest/run_servers.go
index a1751361642de4a663f50612475a2ede82fc6f82..ed75b4bf766661773bc255e8c53af4ee24587dc0 100644 (file)
--- a/sdk/go/arvadostest/run_servers.go
+++ b/sdk/go/arvadostest/run_servers.go
@@ -98,19 +98,29 @@ func StopAPI() {
        exec.Command("python", "run_test_server.py", "stop").Run()
 }
 
+// StartKeep is used to start keep servers
+// with keepExisting = false and enforcePermissions = false
 func StartKeep() {
-       StartKeepAdditional(false)
+       StartKeepWithParams(false, false)
 }
 
-func StartKeepAdditional(keepExisting bool) {
+// StartKeepWithParams is used to start keep servers while specifying
+// keepExisting and enforcePermissions parameters.
+func StartKeepWithParams(keepExisting bool, enforcePermissions bool) {
        cwd, _ := os.Getwd()
        defer os.Chdir(cwd)
        chdirToPythonTests()
 
-       cmd := exec.Command("python", "run_test_server.py", "start_keep")
+       keepExistingStr := ""
        if keepExisting {
-               cmd = exec.Command("python", "run_test_server.py", "start_keep", "--keep_existing", "true")
+               keepExistingStr = "true"
        }
+       enforcePermissionsStr := ""
+       if enforcePermissions {
+               enforcePermissionsStr = "true"
+       }
+       cmd := exec.Command("python", "run_test_server.py", "start_keep", "--keep-existing", keepExistingStr, "--keep-enforce-permissions", enforcePermissionsStr)
+
        stderr, err := cmd.StderrPipe()
        if err != nil {
                log.Fatalf("Setting up stderr pipe: %s", err)

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index fba9bb69295a9cdf4dec4999aa2c8d4ee40b56bb..a7b60e7d7ba8bdcf465d4ee7509c8fb6c0e094ff 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -43,7 +43,8 @@ if not os.path.exists(TEST_TMPDIR):
 
 my_api_host = None
 _cached_config = {}
-keep_existing = None
+keep_existing = False
+enforce_permissions = False
 
 def find_server_pid(PID_PATH, wait=10):
     now = time.time()
@@ -324,8 +325,8 @@ def _start_keep(n, keep_args):
 
     return port
 
-def run_keep(blob_signing_key=None, enforce_permissions=False):
-    if keep_existing is None:
+def run_keep(blob_signing_key=None):
+    if not keep_existing:
       stop_keep()
 
     keep_args = {}
@@ -354,7 +355,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False):
 
     start_index = 0
     end_index = 2
-    if keep_existing is not None:
+    if keep_existing:
         start_index = 2
         end_index = 3
     for d in range(start_index, end_index):
@@ -605,10 +606,15 @@ if __name__ == "__main__":
     parser = argparse.ArgumentParser()
     parser.add_argument('action', type=str, help="one of {}".format(actions))
     parser.add_argument('--auth', type=str, metavar='FIXTURE_NAME', help='Print authorization info for given api_client_authorizations fixture')
-    parser.add_argument('--keep_existing', type=str, help="Used to add additional keep servers, without terminating existing servers")
+    parser.add_argument('--keep-existing', type=str, help="Used to add additional keep servers, without terminating existing servers")
+    parser.add_argument('--keep-enforce-permissions', type=str, help="Enforce keep permissions")
+
     args = parser.parse_args()
 
-    keep_existing = args.keep_existing
+    if args.keep_existing == 'true':
+        keep_existing = True
+    if args.keep_enforce_permissions == 'true':
+        enforce_permissions = True
 
     if args.action not in actions:
         print("Unrecognized action '{}'. Actions are: {}.".format(args.action, actions), file=sys.stderr)

diff --git a/tools/keep-rsync/keep-rsync_test.go b/tools/keep-rsync/keep-rsync_test.go
index 4fdc6a8812787f890077a49f7b461f2fd62d56bc..a4d26fd76de96eb1351622f5a42d2d6fce70f092 100644 (file)
--- a/tools/keep-rsync/keep-rsync_test.go
+++ b/tools/keep-rsync/keep-rsync_test.go
@@ -64,7 +64,7 @@ func setupRsync(c *C) {
        c.Assert(err, Equals, nil)
 
        // Create two more keep servers to be used as destination
-       arvadostest.StartKeepAdditional(true)
+       arvadostest.StartKeepWithParams(true, false)
 
        // load kcDst
        kcDst, err = keepclient.MakeKeepClient(&arvDst)