Make test_account used by default

CrayLabs · May 8, 2023 · a558a64 · a558a64
1 parent 5e242be
commit a558a64
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/tests/full_wlm/test_generic_batch_launch.py b/tests/full_wlm/test_generic_batch_launch.py
@@ -44,9 +44,8 @@ def test_batch_model(fileutils, wlmutils):
 
     script = fileutils.get_test_conf_path("sleep.py")
     batch_settings = exp.create_batch_settings(nodes=1, time="00:01:00")
-    test_account = wlmutils.get_test_account()
-    if test_account:
-        batch_settings.set_account(test_account)
+
+    batch_settings.set_account(wlmutils.get_test_account())
     if wlmutils.get_test_launcher() == "cobalt":
         batch_settings.set_queue("debug-flat-quad")
     run_settings = wlmutils.get_run_settings("python", f"{script} --time=5")
@@ -74,9 +73,8 @@ def test_batch_ensemble(fileutils, wlmutils):
     M2 = exp.create_model("m2", path=test_dir, run_settings=settings)
 
     batch = exp.create_batch_settings(nodes=1, time="00:01:00")
-    test_account = wlmutils.get_test_account()
-    if test_account:
-        batch.set_account(test_account)
+
+    batch.set_account(wlmutils.get_test_account())
     if wlmutils.get_test_launcher() == "cobalt":
         batch.set_queue("debug-flat-quad")
     ensemble = exp.create_ensemble("batch-ens", batch_settings=batch)
@@ -98,9 +96,8 @@ def test_batch_ensemble_replicas(fileutils, wlmutils):
     settings = wlmutils.get_run_settings("python", f"{script} --time=5")
 
     batch = exp.create_batch_settings(nodes=1, time="00:01:00")
-    test_account = wlmutils.get_test_account()
-    if test_account:
-        batch.set_account(test_account)
+
+    batch.set_account(wlmutils.get_test_account())
     if wlmutils.get_test_launcher() == "cobalt":
         # As Cobalt won't allow us to run two
         # jobs in the same debug queue, we need