Merge branch 'master' into 7241-azure-blob-volume

[arvados.git] / services / keepstore / keepstore.go

diff --git a/services/keepstore/keepstore.go b/services/keepstore/keepstore.go
index c7aadacb463e2a68adb2e8f156c7eceabbd078f5..2528f6d6a6c4dbf2f4b509e670c834aa10b9e618 100644 (file)
--- a/services/keepstore/keepstore.go
+++ b/services/keepstore/keepstore.go
@@ -34,8 +34,8 @@ const BlockSize = 64 * 1024 * 1024
 const MinFreeKilobytes = BlockSize / 1024
 
 // Until #6221 is resolved, never_delete must be true.
-// However, allow it to be false in testing with TEST_DATA_MANAGER_TOKEN
-const TEST_DATA_MANAGER_TOKEN = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
+// However, allow it to be false in testing with TestDataManagerToken
+const TestDataManagerToken = "4axaw8zxe0qm22wa6urpp5nskcne8z88cvbupv653y1njyi05h"
 
 // ProcMounts /proc/mounts
 var ProcMounts = "/proc/mounts"
@@ -257,7 +257,7 @@ func main() {
                }
        }
 
-       if neverDelete != true && dataManagerToken != TEST_DATA_MANAGER_TOKEN {
+       if neverDelete != true && dataManagerToken != TestDataManagerToken {
                log.Fatal("never_delete must be true, see #6221")
        }