Test changes

Signed-off-by: Ben <[email protected]>

Author: Neon-White

src/server/system_services/system_store.js

@@ -364,13 +364,11 @@ class SystemStore extends EventEmitter {
     [util.inspect.custom]() { return 'SystemStore'; }
 
     async initial_load_from_mount() {
-        if (!process.env.NOOBAA_ROOT_SECRET) {
-            await P.retry({
-                attempts: 3,
-                delay_ms: 1000,
-                func: () => this.master_key_manager.load_root_keys_from_mount()
-            });
-        }
+        await P.retry({
+            attempts: 3,
+            delay_ms: 1000,
+            func: () => this.master_key_manager.load_root_keys_from_mount()
+        });
         if (db_client.instance().is_connected()) {
             return this.load();
         }

src/test/unit_tests/test_encryption.js

@@ -906,6 +906,8 @@ mocha.describe('Rotation tests', function() {
             await fs.promises.writeFile(config.ROOT_KEY_MOUNT + '/active_root_key', 'key1');
             system_store.master_key_manager.is_initialized = false;
             system_store.master_key_manager.resolved_master_keys_by_id = {};
+            await system_store.master_key_manager.load_root_keys_from_mount();
+            await system_store.load();
             await system_store.load();
             const new_system_store_system = system_by_name(system_store.data.systems, SYSTEM);
             const new_cipher_key = new_system_store_system.master_key_id.cipher_key;