6260: do not force never_delete in keepstore

diff --git a/sdk/python/tests/run_test_server.py b/sdk/python/tests/run_test_server.py
index d7739acdc0ca354bc3bd6f31d5cdfc0f09ca5c52..4421262efa8a21643b9aa3f745133ecbcfb1c3da 100644 (file)
--- a/sdk/python/tests/run_test_server.py
+++ b/sdk/python/tests/run_test_server.py
@@ -337,6 +337,7 @@ def run_keep(blob_signing_key=None, enforce_permissions=False):
     with open(os.path.join(TEST_TMPDIR, "keep.data-manager-token-file"), "w") as f:
         keep_args['--data-manager-token-file'] = f.name
         f.write(os.environ['ARVADOS_API_TOKEN'])
+    keep_args['--never-delete'] = 'false'
 
     api = arvados.api(
         version='v1',

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index 3dfdce20e321bfe61ffb9b9f119e10f189ee2c48..e55e0ef841495724b26a4e89cdf84e11d0051a7e 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -288,10 +288,6 @@ func main() {
 
        flag.Parse()
 
-       if never_delete != true {
-               log.Fatal("never_delete must be true, see #6221")
-       }
-
        if maxBuffers < 0 {
                log.Fatal("-max-buffers must be greater than zero.")
        }