Move tests/unit_tests/job_queue to tests/unit_tests/scheduler

equinor · Dec 4, 2023 · f49e93f · f49e93f
1 parent 83e15a6
commit f49e93f
Show file tree

Hide file tree

Showing 15 changed files with 69 additions and 1 deletion.
diff --git a/tests/unit_tests/job_queue/__init__.py → tests/unit_tests/scheduler/__init__.py b/tests/unit_tests/job_queue/__init__.py → tests/unit_tests/scheduler/__init__.py
diff --git a/tests/unit_tests/scheduler/_test_driver.py b/tests/unit_tests/scheduler/_test_driver.py
@@ -0,0 +1,68 @@
+import os
+
+import pytest
+
+from ert.config import QueueConfig, QueueSystem
+from ert.scheduler import Driver
+
+
+@pytest.mark.xfail(reason="Needs reimplementation")
+def test_set_and_unset_option():
+    queue_config = QueueConfig(
+        job_script="script.sh",
+        queue_system=QueueSystem.LOCAL,
+        max_submit=2,
+        queue_options={
+            QueueSystem.LOCAL: [
+                ("MAX_RUNNING", "50"),
+                ("MAX_RUNNING", ""),
+            ]
+        },
+    )
+    driver = Driver.create_driver(queue_config)
+    assert driver.get_option("MAX_RUNNING") == "0"
+    assert driver.set_option("MAX_RUNNING", "42")
+    assert driver.get_option("MAX_RUNNING") == "42"
+    driver.set_option("MAX_RUNNING", "")
+    assert driver.get_option("MAX_RUNNING") == "0"
+    driver.set_option("MAX_RUNNING", "100")
+    assert driver.get_option("MAX_RUNNING") == "100"
+    driver.set_option("MAX_RUNNING", "0")
+    assert driver.get_option("MAX_RUNNING") == "0"
+
+
+@pytest.mark.xfail(reason="Needs reimplementation")
+def test_get_driver_name():
+    queue_config = QueueConfig(queue_system=QueueSystem.LOCAL)
+    assert Driver.create_driver(queue_config).name == "LOCAL"
+    queue_config = QueueConfig(queue_system=QueueSystem.SLURM)
+    assert Driver.create_driver(queue_config).name == "SLURM"
+    queue_config = QueueConfig(queue_system=QueueSystem.TORQUE)
+    assert Driver.create_driver(queue_config).name == "TORQUE"
+    queue_config = QueueConfig(queue_system=QueueSystem.LSF)
+    assert Driver.create_driver(queue_config).name == "LSF"
+
+
+@pytest.mark.xfail(reason="Needs reimplementation")
+def test_get_slurm_queue_config():
+    queue_config = QueueConfig(
+        job_script=os.path.abspath("script.sh"),
+        queue_system=QueueSystem.SLURM,
+        max_submit=2,
+        queue_options={
+            QueueSystem.SLURM: [
+                ("MAX_RUNNING", "50"),
+                ("SBATCH", "/path/to/sbatch"),
+                ("SQUEUE", "/path/to/squeue"),
+            ]
+        },
+    )
+
+    assert queue_config.queue_system == QueueSystem.SLURM
+    driver = Driver.create_driver(queue_config)
+
+    assert driver.get_option("SBATCH") == "/path/to/sbatch"
+    assert driver.get_option("SCONTROL") == "scontrol"
+    driver.set_option("SCONTROL", "")
+    assert driver.get_option("SCONTROL") == ""
+    assert driver.name == "SLURM"
diff --git a/...t_tests/job_queue/_test_job_queue_node.py → ...t_tests/scheduler/_test_job_queue_node.py b/...t_tests/job_queue/_test_job_queue_node.py → ...t_tests/scheduler/_test_job_queue_node.py
@@ -29,7 +29,7 @@
 def make_driver(queue_system: QueueSystem):
     result = Driver(queue_system)
     if queue_system == QueueSystem.TORQUE:
-        result.options["QSTAT_CMD"] = "qstat"
+        result.set_option("QSTAT_CMD", "qstat")
     return result
 
 

diff --git a/.../job_queue/_test_job_queue_node_torque.py → .../scheduler/_test_job_queue_node_torque.py b/.../job_queue/_test_job_queue_node_torque.py → .../scheduler/_test_job_queue_node_torque.py
diff --git a/...it_tests/job_queue/_test_torque_driver.py → ...it_tests/scheduler/_test_torque_driver.py b/...it_tests/job_queue/_test_torque_driver.py → ...it_tests/scheduler/_test_torque_driver.py
diff --git a/tests/unit_tests/job_queue/conftest.py → tests/unit_tests/scheduler/conftest.py b/tests/unit_tests/job_queue/conftest.py → tests/unit_tests/scheduler/conftest.py
diff --git a/...s/unit_tests/job_queue/test_ert_plugin.py → ...s/unit_tests/scheduler/test_ert_plugin.py b/...s/unit_tests/job_queue/test_ert_plugin.py → ...s/unit_tests/scheduler/test_ert_plugin.py
diff --git a/...s/unit_tests/job_queue/test_ert_script.py → ...s/unit_tests/scheduler/test_ert_script.py b/...s/unit_tests/job_queue/test_ert_script.py → ...s/unit_tests/scheduler/test_ert_script.py
diff --git a/...nit_tests/job_queue/test_forward_model.py → ...nit_tests/scheduler/test_forward_model.py b/...nit_tests/job_queue/test_forward_model.py → ...nit_tests/scheduler/test_forward_model.py
diff --git a/...s/unit_tests/job_queue/test_lsf_driver.py → ...s/unit_tests/scheduler/test_lsf_driver.py b/...s/unit_tests/job_queue/test_lsf_driver.py → ...s/unit_tests/scheduler/test_lsf_driver.py
diff --git a/tests/unit_tests/job_queue/test_job_queue.py → tests/unit_tests/scheduler/test_scheduler.py b/tests/unit_tests/job_queue/test_job_queue.py → tests/unit_tests/scheduler/test_scheduler.py
diff --git a/tests/unit_tests/job_queue/test_workflow.py → tests/unit_tests/scheduler/test_workflow.py b/tests/unit_tests/job_queue/test_workflow.py → tests/unit_tests/scheduler/test_workflow.py
diff --git a/...unit_tests/job_queue/test_workflow_job.py → ...unit_tests/scheduler/test_workflow_job.py b/...unit_tests/job_queue/test_workflow_job.py → ...unit_tests/scheduler/test_workflow_job.py
diff --git a/...t_tests/job_queue/test_workflow_runner.py → ...t_tests/scheduler/test_workflow_runner.py b/...t_tests/job_queue/test_workflow_runner.py → ...t_tests/scheduler/test_workflow_runner.py
diff --git a/...s/unit_tests/job_queue/workflow_common.py → ...s/unit_tests/scheduler/workflow_common.py b/...s/unit_tests/job_queue/workflow_common.py → ...s/unit_tests/scheduler/workflow_common.py