parametrize test_runs

cadCAD-org · Dec 21, 2023 · e11a8b4 · e11a8b4
1 parent d7e38cb
commit e11a8b4
Showing 1 changed file with 12 additions and 29 deletions.
diff --git a/testing/test_runs.py b/testing/test_runs.py
@@ -158,42 +158,25 @@ def sweeped(params: Parameters, substep: Substep, history: StateHistory, state:
     )
     return exp
 
-
-def test_mc_sweep_experiment():
-    experiment_assertions(create_experiment(
-        N_RUNS=2, N_TIMESTEPS=2, params=SWEEP_PARAMS), ExecutionMode.local_mode)
-    experiment_assertions(create_experiment(
-        N_RUNS=2, N_TIMESTEPS=2, params=SWEEP_PARAMS), ExecutionMode.single_mode)
+@pytest.mark.parametrize("mode", ["local_proc", "single_proc", "multi_proc"])
+def test_mc_sweep_experiment(mode):
     experiment_assertions(create_experiment(
-        N_RUNS=2, N_TIMESTEPS=2, params=SWEEP_PARAMS), ExecutionMode.multi_mode)
+        N_RUNS=2, N_TIMESTEPS=2, params=SWEEP_PARAMS), mode)
 
-
-def test_unique_sweep_experiment():
-    experiment_assertions(create_experiment(
-        N_RUNS=1, N_TIMESTEPS=2, params=SWEEP_PARAMS), ExecutionMode.local_mode)
-    experiment_assertions(create_experiment(
-        N_RUNS=1, N_TIMESTEPS=2, params=SWEEP_PARAMS), ExecutionMode.single_mode)
+@pytest.mark.parametrize("mode", ["local_proc", "single_proc", "multi_proc"])
+def test_unique_sweep_experiment(mode):
     experiment_assertions(create_experiment(
-        N_RUNS=1, N_TIMESTEPS=2, params=SWEEP_PARAMS), ExecutionMode.multi_mode)
+        N_RUNS=1, N_TIMESTEPS=2, params=SWEEP_PARAMS), mode)
 
-
-def test_mc_single_experiment():
-    experiment_assertions(create_experiment(
-        N_RUNS=2, N_TIMESTEPS=2, params=SINGLE_PARAMS), ExecutionMode.local_mode)
-    experiment_assertions(create_experiment(
-        N_RUNS=2, N_TIMESTEPS=2, params=SINGLE_PARAMS), ExecutionMode.single_mode)
+@pytest.mark.parametrize("mode", ["local_proc", "single_proc", "multi_proc"])
+def test_mc_single_experiment(mode):
     experiment_assertions(create_experiment(
-        N_RUNS=2, N_TIMESTEPS=2, params=SINGLE_PARAMS), ExecutionMode.multi_mode)
+        N_RUNS=2, N_TIMESTEPS=2, params=SINGLE_PARAMS), mode)
 
-
-def test_unique_single_experiment():
-    experiment_assertions(create_experiment(
-        N_RUNS=1, N_TIMESTEPS=2, params=SINGLE_PARAMS), ExecutionMode.local_mode)
+@pytest.mark.parametrize("mode", ["local_proc", "single_proc", "multi_proc"])
+def test_unique_single_experiment(mode):
     experiment_assertions(create_experiment(
-        N_RUNS=1, N_TIMESTEPS=2, params=SINGLE_PARAMS), ExecutionMode.single_mode)
-    with pytest.raises(ValueError) as e_info:
-        experiment_assertions(create_experiment(
-            N_RUNS=1, N_TIMESTEPS=2, params=SINGLE_PARAMS), ExecutionMode.multi_mode)
+        N_RUNS=1, N_TIMESTEPS=2, params=SINGLE_PARAMS), mode)
 
 
 def experiment_assertions(exp, mode=None):