From: radhika <radhika@curoverse.com>
Date: Thu, 3 Sep 2015 15:26:12 +0000 (-0400)
Subject: 6260: do not force never_delete in keepstore
X-Git-Tag: 1.1.0~1354^2~25
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/a7f96d94925721f6fe0be23fc626f00f05be635e

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 d7739acdc0..4421262efa 100644
--- 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 3dfdce20e3..e55e0ef841 100644
--- 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.")
 	}