pyiron · jan-janssen · Feb 1, 2026 · Feb 1, 2026 · Feb 1, 2026 · Feb 1, 2026
@@ -218,7 +218,7 @@ jobs:
       timeout-minutes: 5
       run: >
         flux start
-        python -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py;
+        python -m unittest tests/task_scheduler/interactive/test_spawner_flux.py tests/executor/test_flux_job_plot.py tests/executor/test_flux_job.py tests/executor/test_flux_cluster.py;
 
   unittest_flux_openmpi:
     needs: [black]
@@ -249,7 +249,7 @@ jobs:
       timeout-minutes: 5
       run: >
         flux start
-        coverage run -a -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py;
+        coverage run -a -m unittest tests/task_scheduler/interactive/test_spawner_flux.py tests/executor/test_flux_job_plot.py tests/executor/test_flux_job.py tests/executor/test_flux_cluster.py;
         coverage report;
         coverage xml
       env:
@@ -292,8 +292,8 @@ jobs:
         cd tests
         sinfo -o "%n %e %m %a %c %C"
         srun --mpi=list
-        python -m unittest test_slurmjobexecutor.py
-        python -m unittest test_slurmclusterexecutor.py
+        python -m unittest executor/test_slurm_job.py
+        python -m unittest tests/executor/test_slurm_cluster.py
 
   unittest_mpich:
     needs: [black]

diff --git a/tests/backend/__init__.py b/tests/backend/__init__.py
diff --git a/tests/test_backend_interactive_serial.py → tests/backend/test_interactive_serial.py b/tests/test_backend_interactive_serial.py → tests/backend/test_interactive_serial.py
diff --git a/tests/executor/__init__.py b/tests/executor/__init__.py
diff --git a/tests/test_testclusterexecutor.py → tests/executor/test_api.py b/tests/test_testclusterexecutor.py → tests/executor/test_api.py
diff --git a/tests/test_fluxclusterexecutor.py → tests/executor/test_flux_cluster.py b/tests/test_fluxclusterexecutor.py → tests/executor/test_flux_cluster.py
diff --git a/tests/test_fluxjobexecutor.py → tests/executor/test_flux_job.py b/tests/test_fluxjobexecutor.py → tests/executor/test_flux_job.py
@@ -111,7 +111,7 @@ def test_single_task(self):
         )
 
     def test_output_files_cwd(self):
-        dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
+        dirname = os.path.abspath(os.path.join(os.path.dirname(__file__), "..", ".."))
         os.makedirs(dirname, exist_ok=True)
         file_stdout = os.path.join(dirname, "flux.out")
         file_stderr = os.path.join(dirname, "flux.err")

diff --git a/tests/test_fluxjobexecutor_plot.py → tests/executor/test_flux_job_plot.py b/tests/test_fluxjobexecutor_plot.py → tests/executor/test_flux_job_plot.py
diff --git a/tests/test_singlenodeexecutor_cache.py → tests/executor/test_single_cache.py b/tests/test_singlenodeexecutor_cache.py → tests/executor/test_single_cache.py
diff --git a/...s/test_singlenodeexecutor_dependencies.py → tests/executor/test_single_dependencies.py b/...s/test_singlenodeexecutor_dependencies.py → tests/executor/test_single_dependencies.py
diff --git a/tests/test_singlenodeexecutor_mpi.py → tests/executor/test_single_mpi.py b/tests/test_singlenodeexecutor_mpi.py → tests/executor/test_single_mpi.py
diff --git a/tests/test_singlenodeexecutor_noblock.py → tests/executor/test_single_noblock.py b/tests/test_singlenodeexecutor_noblock.py → tests/executor/test_single_noblock.py
diff --git a/...est_singlenodeexecutor_plot_dependency.py → ...s/executor/test_single_plot_dependency.py b/...est_singlenodeexecutor_plot_dependency.py → ...s/executor/test_single_plot_dependency.py
diff --git a/tests/test_singlenodeexecutor_pwd.py → tests/executor/test_single_pwd.py b/tests/test_singlenodeexecutor_pwd.py → tests/executor/test_single_pwd.py
diff --git a/tests/test_singlenodeexecutor_resize.py → tests/executor/test_single_resize.py b/tests/test_singlenodeexecutor_resize.py → tests/executor/test_single_resize.py
diff --git a/...test_singlenodeexecutor_shell_executor.py → tests/executor/test_single_shell_executor.py b/...test_singlenodeexecutor_shell_executor.py → tests/executor/test_single_shell_executor.py
diff --git a/...t_singlenodeexecutor_shell_interactive.py → ...executor/test_single_shell_interactive.py b/...t_singlenodeexecutor_shell_interactive.py → ...executor/test_single_shell_interactive.py
@@ -10,7 +10,7 @@
 from executorlib.standalone.interactive.spawner import MpiExecSpawner
 
 
-executable_path = os.path.join(os.path.dirname(__file__), "executables", "count.py")
+executable_path = os.path.join(os.path.dirname(__file__), "..", "executables", "count.py")
 
 
 def init_process():

diff --git a/tests/test_slurmclusterexecutor.py → tests/executor/test_slurm_cluster.py b/tests/test_slurmclusterexecutor.py → tests/executor/test_slurm_cluster.py
diff --git a/tests/test_slurmjobexecutor.py → tests/executor/test_slurm_job.py b/tests/test_slurmjobexecutor.py → tests/executor/test_slurm_job.py
diff --git a/tests/standalone/__init__.py b/tests/standalone/__init__.py
diff --git a/tests/standalone/interactive/__init__.py b/tests/standalone/interactive/__init__.py
diff --git a/.../test_standalone_interactive_arguments.py → .../standalone/interactive/test_arguments.py b/.../test_standalone_interactive_arguments.py → .../standalone/interactive/test_arguments.py
diff --git a/tests/test_standalone_interactive_backend.py → tests/standalone/interactive/test_backend.py b/tests/test_standalone_interactive_backend.py → tests/standalone/interactive/test_backend.py
diff --git a/...t_standalone_interactive_communication.py → ...ndalone/interactive/test_communication.py b/...t_standalone_interactive_communication.py → ...ndalone/interactive/test_communication.py
@@ -46,7 +46,8 @@ def test_interface_mpi(self):
                 sys.executable,
                 os.path.abspath(
                     os.path.join(
-                        __file__,
+                        os.path.dirname(__file__),
+                        "..",
                         "..",
                         "..",
                         "src",
@@ -77,7 +78,8 @@ def test_interface_serial_without_debug(self):
                 sys.executable,
                 os.path.abspath(
                     os.path.join(
-                        __file__,
+                        os.path.dirname(__file__),
+                        "..",
                         "..",
                         "..",
                         "src",
@@ -108,7 +110,8 @@ def test_interface_serial_with_debug(self):
                 sys.executable,
                 os.path.abspath(
                     os.path.join(
-                        __file__,
+                        os.path.dirname(__file__),
+                        "..",
                         "..",
                         "..",
                         "src",
@@ -170,7 +173,8 @@ def test_interface_serial_with_stopped_process(self):
                 sys.executable,
                 os.path.abspath(
                     os.path.join(
-                        __file__,
+                        os.path.dirname(__file__),
+                        "..",
                         "..",
                         "..",
                         "src",

diff --git a/tests/test_mpiexecspawner.py → tests/standalone/interactive/test_spawner.py b/tests/test_mpiexecspawner.py → tests/standalone/interactive/test_spawner.py
diff --git a/tests/test_standalone_batched.py → tests/standalone/test_batched.py b/tests/test_standalone_batched.py → tests/standalone/test_batched.py
diff --git a/tests/test_standalone_command.py → tests/standalone/test_command.py b/tests/test_standalone_command.py → tests/standalone/test_command.py
diff --git a/tests/test_standalone_error.py → tests/standalone/test_error.py b/tests/test_standalone_error.py → tests/standalone/test_error.py
diff --git a/tests/test_standalone_hdf.py → tests/standalone/test_hdf.py b/tests/test_standalone_hdf.py → tests/standalone/test_hdf.py
diff --git a/tests/test_standalone_inputcheck.py → tests/standalone/test_inputcheck.py b/tests/test_standalone_inputcheck.py → tests/standalone/test_inputcheck.py
diff --git a/tests/test_base_executor_queue.py → tests/standalone/test_queue.py b/tests/test_base_executor_queue.py → tests/standalone/test_queue.py
diff --git a/tests/test_standalone_select.py → tests/standalone/test_select.py b/tests/test_standalone_select.py → tests/standalone/test_select.py
diff --git a/tests/test_standalone_serialize.py → tests/standalone/test_serialize.py b/tests/test_standalone_serialize.py → tests/standalone/test_serialize.py
diff --git a/tests/test_interactive_slurmspawner.py → tests/standalone/test_slurm_command.py b/tests/test_interactive_slurmspawner.py → tests/standalone/test_slurm_command.py
diff --git a/tests/task_scheduler/__init__.py b/tests/task_scheduler/__init__.py
diff --git a/tests/task_scheduler/file/__init__.py b/tests/task_scheduler/file/__init__.py
diff --git a/tests/test_cache_backend_execute.py → tests/task_scheduler/file/test_backend.py b/tests/test_cache_backend_execute.py → tests/task_scheduler/file/test_backend.py
diff --git a/tests/test_cache_fileexecutor_mpi.py → tests/task_scheduler/file/test_mpi.py b/tests/test_cache_fileexecutor_mpi.py → tests/task_scheduler/file/test_mpi.py
diff --git a/tests/test_cache_fileexecutor_serial.py → tests/task_scheduler/file/test_serial.py b/tests/test_cache_fileexecutor_serial.py → tests/task_scheduler/file/test_serial.py
@@ -74,15 +74,15 @@ def test_executor_dependence_error(self):
                 fs.result()
 
     def test_executor_working_directory(self):
-        cwd = os.path.join(os.path.dirname(__file__), "executables")
+        cwd = os.path.join(os.path.dirname(__file__), "..", "..", "executables")
         with FileTaskScheduler(
             resource_dict={"cwd": cwd}, execute_function=execute_in_subprocess
         ) as exe:
             fs1 = exe.submit(list_files_in_working_directory)
             self.assertEqual(fs1.result(), os.listdir(cwd))
 
     def test_executor_error(self):
-        cwd = os.path.join(os.path.dirname(__file__), "executables")
+        cwd = os.path.join(os.path.dirname(__file__), "..", "..", "executables")
         with FileTaskScheduler(
             resource_dict={"cwd": cwd}, execute_function=execute_in_subprocess
         ) as exe:
@@ -92,9 +92,9 @@ def test_executor_error(self):
         self.assertEqual(len(os.listdir(cwd)), 1)
 
     def test_executor_error_file(self):
-        cwd = os.path.join(os.path.dirname(__file__), "executables")
+        cwd = os.path.join(os.path.dirname(__file__), "..", "..", "executables")
         with FileTaskScheduler(
-            resource_dict={"cwd": cwd, "error_log_file": "error.out"}, 
+            resource_dict={"cwd": cwd, "error_log_file": "error.out"},
             execute_function=execute_in_subprocess
         ) as exe:
             fs1 = exe.submit(get_error, a=1)
@@ -224,8 +224,8 @@ def test_execute_in_subprocess(self):
         self.assertIsNone(terminate_subprocess(task=process))
 
     def test_execute_in_subprocess_errors(self):
-        file_name = os.path.abspath(os.path.join(__file__, "..", "executorlib_cache", "test.h5"))
-        os.makedirs(os.path.dirname(file_name))
+        file_name = os.path.abspath(os.path.join(os.path.dirname(__file__), "executorlib_cache", "test.h5"))
+        os.makedirs(os.path.dirname(file_name), exist_ok=True)
         with open(file_name, "w") as f:
             f.write("test")
         with self.assertRaises(ValueError):

diff --git a/tests/task_scheduler/interactive/__init__.py b/tests/task_scheduler/interactive/__init__.py
diff --git a/tests/test_interactive_dependencies.py → ..._scheduler/interactive/test_dependency.py b/tests/test_interactive_dependencies.py → ..._scheduler/interactive/test_dependency.py
diff --git a/...test_task_scheduler_interactive_shared.py → ...task_scheduler/interactive/test_shared.py b/...test_task_scheduler_interactive_shared.py → ...task_scheduler/interactive/test_shared.py
diff --git a/tests/test_fluxpythonspawner.py → ...cheduler/interactive/test_spawner_flux.py b/tests/test_fluxpythonspawner.py → ...cheduler/interactive/test_spawner_flux.py