From c3359c51d9b7e1d639768df044ab2e619f886487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Tue, 25 Mar 2025 08:46:25 +0100 Subject: [PATCH 1/2] Refactor Test Environment --- .github/workflows/pipeline.yml | 2 +- ...est_backend_serial.py => test_backend_interactive_serial.py} | 0 ...{test_shared_executorbase.py => test_base_executor_queue.py} | 0 tests/{test_cache_shared.py => test_cache_backend_execute.py} | 0 ...est_cache_executor_mpi.py => test_cache_fileexecutor_mpi.py} | 0 ...che_executor_serial.py => test_cache_fileexecutor_serial.py} | 0 ...cache_executor_pysqa_flux.py => test_fluxclusterexecutor.py} | 0 .../{test_executor_backend_flux.py => test_fluxjobexecutor.py} | 0 ...est_plot_dependency_flux.py => test_fluxjobexecutor_plot.py} | 0 tests/{test_flux_executor.py => test_fluxpythonspawner.py} | 0 ...ocal_executor_future.py => test_interactive_dependencies.py} | 0 ...est_pysqa_subprocess.py => test_interactive_slurmspawner.py} | 0 tests/{test_local_executor.py => test_mpiexecspawner.py} | 0 ...executor_interactive.py => test_singlenodeexecutor_cache.py} | 0 ...cies_executor.py => test_singlenodeexecutor_dependencies.py} | 0 ...t_executor_backend_mpi.py => test_singlenodeexecutor_mpi.py} | 0 ...ackend_mpi_noblock.py => test_singlenodeexecutor_noblock.py} | 0 ...dependency.py => test_singlenodeexecutor_plot_dependency.py} | 0 ...cal_executor_resize.py => test_singlenodeexecutor_resize.py} | 0 ...ll_executor.py => test_singlenodeexecutor_shell_executor.py} | 0 ...eractive.py => test_singlenodeexecutor_shell_interactive.py} | 0 tests/{test_cache_hdf.py => test_standalone_hdf.py} | 0 ...test_shared_input_check.py => test_standalone_inputcheck.py} | 0 ...re_arguments.py => test_standalone_interactive_arguments.py} | 0 ...shared_backend.py => test_standalone_interactive_backend.py} | 0 ...nication.py => test_standalone_interactive_communication.py} | 0 26 files changed, 1 insertion(+), 1 deletion(-) rename tests/{test_backend_serial.py => test_backend_interactive_serial.py} (100%) rename tests/{test_shared_executorbase.py => test_base_executor_queue.py} (100%) rename tests/{test_cache_shared.py => test_cache_backend_execute.py} (100%) rename tests/{test_cache_executor_mpi.py => test_cache_fileexecutor_mpi.py} (100%) rename tests/{test_cache_executor_serial.py => test_cache_fileexecutor_serial.py} (100%) rename tests/{test_cache_executor_pysqa_flux.py => test_fluxclusterexecutor.py} (100%) rename tests/{test_executor_backend_flux.py => test_fluxjobexecutor.py} (100%) rename tests/{test_plot_dependency_flux.py => test_fluxjobexecutor_plot.py} (100%) rename tests/{test_flux_executor.py => test_fluxpythonspawner.py} (100%) rename tests/{test_local_executor_future.py => test_interactive_dependencies.py} (100%) rename tests/{test_pysqa_subprocess.py => test_interactive_slurmspawner.py} (100%) rename tests/{test_local_executor.py => test_mpiexecspawner.py} (100%) rename tests/{test_cache_executor_interactive.py => test_singlenodeexecutor_cache.py} (100%) rename tests/{test_dependencies_executor.py => test_singlenodeexecutor_dependencies.py} (100%) rename tests/{test_executor_backend_mpi.py => test_singlenodeexecutor_mpi.py} (100%) rename tests/{test_executor_backend_mpi_noblock.py => test_singlenodeexecutor_noblock.py} (100%) rename tests/{test_plot_dependency.py => test_singlenodeexecutor_plot_dependency.py} (100%) rename tests/{test_local_executor_resize.py => test_singlenodeexecutor_resize.py} (100%) rename tests/{test_shell_executor.py => test_singlenodeexecutor_shell_executor.py} (100%) rename tests/{test_shell_interactive.py => test_singlenodeexecutor_shell_interactive.py} (100%) rename tests/{test_cache_hdf.py => test_standalone_hdf.py} (100%) rename tests/{test_shared_input_check.py => test_standalone_inputcheck.py} (100%) rename tests/{test_interactive_future_arguments.py => test_standalone_interactive_arguments.py} (100%) rename tests/{test_shared_backend.py => test_standalone_interactive_backend.py} (100%) rename tests/{test_shared_communication.py => test_standalone_interactive_communication.py} (100%) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index 24faa4b6..bd91b58b 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -200,7 +200,7 @@ jobs: timeout-minutes: 5 run: > flux start - python -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py; + python -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py; unittest_flux_openmpi: needs: [black] diff --git a/tests/test_backend_serial.py b/tests/test_backend_interactive_serial.py similarity index 100% rename from tests/test_backend_serial.py rename to tests/test_backend_interactive_serial.py diff --git a/tests/test_shared_executorbase.py b/tests/test_base_executor_queue.py similarity index 100% rename from tests/test_shared_executorbase.py rename to tests/test_base_executor_queue.py diff --git a/tests/test_cache_shared.py b/tests/test_cache_backend_execute.py similarity index 100% rename from tests/test_cache_shared.py rename to tests/test_cache_backend_execute.py diff --git a/tests/test_cache_executor_mpi.py b/tests/test_cache_fileexecutor_mpi.py similarity index 100% rename from tests/test_cache_executor_mpi.py rename to tests/test_cache_fileexecutor_mpi.py diff --git a/tests/test_cache_executor_serial.py b/tests/test_cache_fileexecutor_serial.py similarity index 100% rename from tests/test_cache_executor_serial.py rename to tests/test_cache_fileexecutor_serial.py diff --git a/tests/test_cache_executor_pysqa_flux.py b/tests/test_fluxclusterexecutor.py similarity index 100% rename from tests/test_cache_executor_pysqa_flux.py rename to tests/test_fluxclusterexecutor.py diff --git a/tests/test_executor_backend_flux.py b/tests/test_fluxjobexecutor.py similarity index 100% rename from tests/test_executor_backend_flux.py rename to tests/test_fluxjobexecutor.py diff --git a/tests/test_plot_dependency_flux.py b/tests/test_fluxjobexecutor_plot.py similarity index 100% rename from tests/test_plot_dependency_flux.py rename to tests/test_fluxjobexecutor_plot.py diff --git a/tests/test_flux_executor.py b/tests/test_fluxpythonspawner.py similarity index 100% rename from tests/test_flux_executor.py rename to tests/test_fluxpythonspawner.py diff --git a/tests/test_local_executor_future.py b/tests/test_interactive_dependencies.py similarity index 100% rename from tests/test_local_executor_future.py rename to tests/test_interactive_dependencies.py diff --git a/tests/test_pysqa_subprocess.py b/tests/test_interactive_slurmspawner.py similarity index 100% rename from tests/test_pysqa_subprocess.py rename to tests/test_interactive_slurmspawner.py diff --git a/tests/test_local_executor.py b/tests/test_mpiexecspawner.py similarity index 100% rename from tests/test_local_executor.py rename to tests/test_mpiexecspawner.py diff --git a/tests/test_cache_executor_interactive.py b/tests/test_singlenodeexecutor_cache.py similarity index 100% rename from tests/test_cache_executor_interactive.py rename to tests/test_singlenodeexecutor_cache.py diff --git a/tests/test_dependencies_executor.py b/tests/test_singlenodeexecutor_dependencies.py similarity index 100% rename from tests/test_dependencies_executor.py rename to tests/test_singlenodeexecutor_dependencies.py diff --git a/tests/test_executor_backend_mpi.py b/tests/test_singlenodeexecutor_mpi.py similarity index 100% rename from tests/test_executor_backend_mpi.py rename to tests/test_singlenodeexecutor_mpi.py diff --git a/tests/test_executor_backend_mpi_noblock.py b/tests/test_singlenodeexecutor_noblock.py similarity index 100% rename from tests/test_executor_backend_mpi_noblock.py rename to tests/test_singlenodeexecutor_noblock.py diff --git a/tests/test_plot_dependency.py b/tests/test_singlenodeexecutor_plot_dependency.py similarity index 100% rename from tests/test_plot_dependency.py rename to tests/test_singlenodeexecutor_plot_dependency.py diff --git a/tests/test_local_executor_resize.py b/tests/test_singlenodeexecutor_resize.py similarity index 100% rename from tests/test_local_executor_resize.py rename to tests/test_singlenodeexecutor_resize.py diff --git a/tests/test_shell_executor.py b/tests/test_singlenodeexecutor_shell_executor.py similarity index 100% rename from tests/test_shell_executor.py rename to tests/test_singlenodeexecutor_shell_executor.py diff --git a/tests/test_shell_interactive.py b/tests/test_singlenodeexecutor_shell_interactive.py similarity index 100% rename from tests/test_shell_interactive.py rename to tests/test_singlenodeexecutor_shell_interactive.py diff --git a/tests/test_cache_hdf.py b/tests/test_standalone_hdf.py similarity index 100% rename from tests/test_cache_hdf.py rename to tests/test_standalone_hdf.py diff --git a/tests/test_shared_input_check.py b/tests/test_standalone_inputcheck.py similarity index 100% rename from tests/test_shared_input_check.py rename to tests/test_standalone_inputcheck.py diff --git a/tests/test_interactive_future_arguments.py b/tests/test_standalone_interactive_arguments.py similarity index 100% rename from tests/test_interactive_future_arguments.py rename to tests/test_standalone_interactive_arguments.py diff --git a/tests/test_shared_backend.py b/tests/test_standalone_interactive_backend.py similarity index 100% rename from tests/test_shared_backend.py rename to tests/test_standalone_interactive_backend.py diff --git a/tests/test_shared_communication.py b/tests/test_standalone_interactive_communication.py similarity index 100% rename from tests/test_shared_communication.py rename to tests/test_standalone_interactive_communication.py From 96b3f0e557b1e9d2fe708fbabe1264b2156aee19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Jan=C3=9Fen?= Date: Tue, 25 Mar 2025 08:56:37 +0100 Subject: [PATCH 2/2] fix CI --- .github/workflows/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pipeline.yml b/.github/workflows/pipeline.yml index bd91b58b..12658130 100644 --- a/.github/workflows/pipeline.yml +++ b/.github/workflows/pipeline.yml @@ -231,7 +231,7 @@ jobs: timeout-minutes: 5 run: > flux start - coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest tests/test_flux_executor.py tests/test_executor_backend_flux.py tests/test_cache_executor_pysqa_flux.py tests/test_plot_dependency_flux.py; + coverage run -a --omit="executorlib/_version.py,tests/*" -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py; coverage xml env: EXECUTORLIB_PMIX: "pmix"