move retryWrites processing outside of test

kbase · May 30, 2024 · c68cf7e · c68cf7e
1 parent 7dd51c0
commit c68cf7e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/lib/AbstractHandle/Utils/MongoUtil.py b/lib/AbstractHandle/Utils/MongoUtil.py
@@ -62,7 +62,7 @@ def __init__(self, config):
         self.mongo_user = config['mongo-user']
         self.mongo_pass = config['mongo-password']
         self.mongo_authmechanism = config['mongo-authmechanism']
-        self.mongo_retrywrites = config['mongo-retrywrites']
+        self.mongo_retrywrites = config.get('mongo-retrywrites') == "true"
 
         self.handle_collection = self._get_collection(self.mongo_host, self.mongo_port,
                                                       self.mongo_database, MONGO_COLLECTION,

diff --git a/test/config_test.py b/test/config_test.py
@@ -20,11 +20,10 @@ def test_minimal_config(self):
         auth-url=https://ci.kbase.us/services/auth\n
         shock-url=https://ci.kbase.us/services/shock-api\n
         admin-token=998\n
-        test-token=998\n
+        test-token=999\n
         admin-roles=HANDLE_ADMIN, KBASE_ADMIN\n
         namespace=KBH\n
-        mongo-database=handle_db\n
-        mongo-retrywrites=false
+        mongo-database=handle_db
         """
         try:
             cfg_path = create_temp_file(data_string)
@@ -49,13 +48,13 @@ def test_minimal_config(self):
             deploy_cfg["shock-url"], "https://ci.kbase.us/services/shock-api"
         )
         self.assertEqual(deploy_cfg["admin-token"], "998")
-        self.assertEqual(deploy_cfg["test-token"], "998")
+        self.assertEqual(deploy_cfg["test-token"], "999")
         self.assertEqual(deploy_cfg["admin-roles"], "HANDLE_ADMIN, KBASE_ADMIN")
         self.assertEqual(deploy_cfg["namespace"], "KBH")
         self.assertEqual(deploy_cfg["mongo-database"], "handle_db")
         self.assertEqual(deploy_cfg["mongo-user"], "")
         self.assertEqual(deploy_cfg["mongo-password"], "")
-        self.assertEqual(deploy_cfg["mongo-retrywrites"], False)
+        self.assertEqual(deploy_cfg["mongo-retrywrites"], "")
 
         # remove temp file
         os.remove(cfg_path)
@@ -70,7 +69,7 @@ def test_maximal_config(self):
         auth-url=https://ci.kbase.us/services/auth\n
         shock-url=https://ci.kbase.us/services/shock-api\n
         admin-token=998\n
-        test-token=998\n
+        test-token=999\n
         admin-roles=HANDLE_ADMIN, KBASE_ADMIN\n
         namespace=KBH\n
         mongo-database=handle_db\n
@@ -101,13 +100,13 @@ def test_maximal_config(self):
             deploy_cfg["shock-url"], "https://ci.kbase.us/services/shock-api"
         )
         self.assertEqual(deploy_cfg["admin-token"], "998")
-        self.assertEqual(deploy_cfg["test-token"], "998")
+        self.assertEqual(deploy_cfg["test-token"], "999")
         self.assertEqual(deploy_cfg["admin-roles"], "HANDLE_ADMIN, KBASE_ADMIN")
         self.assertEqual(deploy_cfg["namespace"], "KBH")
         self.assertEqual(deploy_cfg["mongo-database"], "handle_db")
         self.assertEqual(deploy_cfg["mongo-user"], "mongouser")
         self.assertEqual(deploy_cfg["mongo-password"], "mongopassword")
-        self.assertEqual(deploy_cfg["mongo-retrywrites"], True)
+        self.assertEqual(deploy_cfg["mongo-retrywrites"], "true")
 
         # remove temp file
         os.remove(cfg_path)
diff --git a/test/mongo_util.py b/test/mongo_util.py
@@ -64,7 +64,7 @@ def get_config() -> Tuple[MongoConfigTuple, dict[str, str]]:
     db_name = _get_value(section, TEST_DATABASE_NAME, config_path, True)
     mongo_user = _get_value(section, TEST_DATABASE_USER, config_path, False)
     mongo_pwd = _get_value(section, TEST_DATABASE_PWD, config_path, False)
-    mongo_retrywrites = _get_value(section, TEST_MONGO_RETRYWRITES, config_path, True)
+    mongo_retrywrites = _get_value(section, TEST_MONGO_RETRYWRITES, config_path, False)
 
     mongo_config = MongoConfigTuple(
         Path(mongo_exe_path),
@@ -84,7 +84,7 @@ def get_config() -> Tuple[MongoConfigTuple, dict[str, str]]:
         TEST_DATABASE_NAME: db_name,
         TEST_DATABASE_USER: mongo_user,
         TEST_DATABASE_PWD: mongo_pwd,
-        TEST_MONGO_RETRYWRITES: mongo_retrywrites == "true",
+        TEST_MONGO_RETRYWRITES: mongo_retrywrites,
     }
 
     return mongo_config, deploy_config