Merge branch 'multdata' of github.com:juliaputko/SmartSim into multdata

CrayLabs · Sep 15, 2023 · 27b7314 · 27b7314
2 parents 775c71c + 0afd27c
commit 27b7314
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/smartsim/database/orchestrator.py b/smartsim/database/orchestrator.py
@@ -567,8 +567,11 @@ def set_db_conf(self, key: str, value: t.Union[int, str]) -> None:
                 "Clustered" if self.num_shards > 2 else "Standalone"
             )
 
-            options = ConfigOptions.create_from_environment(name)
-            client = Client(options, logger_name="SmartSim")
+            if name: 
+                options = ConfigOptions.create_from_environment(name)
+                client = Client(options)
+            else: 
+                client = Client(None, logger_name="SmartSim")
 
             try:
                 for address in addresses:

diff --git a/tests/backends/test_dbscript.py b/tests/backends/test_dbscript.py
@@ -932,11 +932,13 @@ def test_multidb_standard_then_colo(fileutils, wlmutils, coloutils, db_type):
     )
 
     #try:
-    exp.start(db, smartsim_model)
-    #statuses = exp.get_status(smartsim_model)
-    #assert all([stat == status.STATUS_COMPLETED for stat in statuses])
+    exp.start(db)
+    exp.start(smartsim_model)
+    statuses = exp.get_status(smartsim_model)
+    assert all([stat == status.STATUS_COMPLETED for stat in statuses])
     #finally:
-    exp.stop(db, smartsim_model)
+    exp.stop(db)
+    exp.stop(smartsim_model)
     print(exp.summary())