Update the tests

Author: stephen-riggs

tests/services/test_class2d.py

@@ -330,7 +330,7 @@ def test_class2d_service_complete_batch(mock_subprocess, offline_transport, tmp_
 
     # Check the expected command was run
     class2d_command = [
-        "srun",
+        "mpirun",
         "-n",
         "5",
         "relion_refine_mpi",

tests/services/test_class3d.py

@@ -103,7 +103,7 @@ def test_class3d_service_has_initial_model(
     # Check the expected 3D classifcation command was run
     assert mock_subprocess.call_count == 4
     class3d_command = [
-        "srun",
+        "mpirun",
         "-n",
         "5",
         "relion_refine_mpi",
@@ -282,6 +282,7 @@ def test_class3d_service_rerun(
                     "do_initial_model": False,
                     "initial_model_file": f"{tmp_path}/initial_model.mrc",
                     "mask_diameter": "190.0",
+                    "mpi_run_command": "srun -n 5",
                     "particle_diameter": "180",
                     "particles_file": f"{tmp_path}/Select/job013/particles_100000.star",
                     "picker_id": "6",

tests/wrappers/test_class2d_wrapper.py

@@ -352,7 +352,7 @@ def test_class2d_wrapper_complete_batch(
 
     # Check the expected command was run
     class2d_command = [
-        "srun",
+        "mpirun",
         "-n",
         "5",
         "relion_refine_mpi",

tests/wrappers/test_class3d_wrapper.py

@@ -499,7 +499,7 @@ def test_class3d_wrapper_has_initial_model(
     # Check the expected 3D classifcation command was run
     assert mock_subprocess.call_count == 4
     class3d_command = [
-        "srun",
+        "mpirun",
         "-n",
         "5",
         "relion_refine_mpi",

tests/wrappers/test_refine3d_wrapper.py

@@ -350,7 +350,7 @@ def test_refine3d_wrapper_no_mask(
     )
 
     refine3d_command = [
-        "srun",
+        "mpirun",
         "-n",
         "5",
         "relion_refine_mpi",