From 9b39cd0b85051a54a162633e4ee2d9b5f0145783 Mon Sep 17 00:00:00 2001 From: Yuri Chiucconi Date: Wed, 5 Feb 2025 16:14:34 +0100 Subject: [PATCH] change import ref #2248 --- ...test_full_workflow_local_experimental_v2.py | 18 +++++++++++++----- .../test_full_workflow_local_v2.py | 18 +++++++++++++----- .../test_full_workflow_slurm_ssh_v2.py | 4 +++- .../test_full_workflow_slurm_v2.py | 14 ++++++++++---- 4 files changed, 39 insertions(+), 15 deletions(-) diff --git a/tests/v2/test_07_full_workflow/test_full_workflow_local_experimental_v2.py b/tests/v2/test_07_full_workflow/test_full_workflow_local_experimental_v2.py index 36f6ace599..adefb5b6d4 100644 --- a/tests/v2/test_07_full_workflow/test_full_workflow_local_experimental_v2.py +++ b/tests/v2/test_07_full_workflow/test_full_workflow_local_experimental_v2.py @@ -1,8 +1,16 @@ -from common_functions import failing_workflow_UnknownError -from common_functions import full_workflow -from common_functions import full_workflow_TaskExecutionError -from common_functions import non_executable_task_command -from common_functions import workflow_with_non_python_task +from tests.v2.test_07_full_workflow.common_functions import ( + failing_workflow_UnknownError, +) +from tests.v2.test_07_full_workflow.common_functions import full_workflow +from tests.v2.test_07_full_workflow.common_functions import ( + full_workflow_TaskExecutionError, +) +from tests.v2.test_07_full_workflow.common_functions import ( + non_executable_task_command, +) +from tests.v2.test_07_full_workflow.common_functions import ( + workflow_with_non_python_task, +) FRACTAL_RUNNER_BACKEND = "local_experimental" diff --git a/tests/v2/test_07_full_workflow/test_full_workflow_local_v2.py b/tests/v2/test_07_full_workflow/test_full_workflow_local_v2.py index db0ace353b..d2b1aed700 100644 --- a/tests/v2/test_07_full_workflow/test_full_workflow_local_v2.py +++ b/tests/v2/test_07_full_workflow/test_full_workflow_local_v2.py @@ -1,8 +1,16 @@ -from common_functions import failing_workflow_UnknownError -from common_functions import full_workflow -from common_functions import full_workflow_TaskExecutionError -from common_functions import non_executable_task_command -from common_functions import workflow_with_non_python_task +from tests.v2.test_07_full_workflow.common_functions import ( + failing_workflow_UnknownError, +) +from tests.v2.test_07_full_workflow.common_functions import full_workflow +from tests.v2.test_07_full_workflow.common_functions import ( + full_workflow_TaskExecutionError, +) +from tests.v2.test_07_full_workflow.common_functions import ( + non_executable_task_command, +) +from tests.v2.test_07_full_workflow.common_functions import ( + workflow_with_non_python_task, +) FRACTAL_RUNNER_BACKEND = "local" diff --git a/tests/v2/test_07_full_workflow/test_full_workflow_slurm_ssh_v2.py b/tests/v2/test_07_full_workflow/test_full_workflow_slurm_ssh_v2.py index a3384d63f9..5f45acc93c 100644 --- a/tests/v2/test_07_full_workflow/test_full_workflow_slurm_ssh_v2.py +++ b/tests/v2/test_07_full_workflow/test_full_workflow_slurm_ssh_v2.py @@ -1,10 +1,12 @@ import io import pytest -from common_functions import workflow_with_non_python_task from fractal_server.ssh._fabric import FractalSSHList from tests.fixtures_slurm import SLURM_USER +from tests.v2.test_07_full_workflow.common_functions import ( + workflow_with_non_python_task, +) FRACTAL_RUNNER_BACKEND = "slurm_ssh" diff --git a/tests/v2/test_07_full_workflow/test_full_workflow_slurm_v2.py b/tests/v2/test_07_full_workflow/test_full_workflow_slurm_v2.py index 08c784ad00..0a9046a7ea 100644 --- a/tests/v2/test_07_full_workflow/test_full_workflow_slurm_v2.py +++ b/tests/v2/test_07_full_workflow/test_full_workflow_slurm_v2.py @@ -1,15 +1,21 @@ import logging import pytest -from common_functions import failing_workflow_UnknownError -from common_functions import full_workflow -from common_functions import full_workflow_TaskExecutionError -from common_functions import non_executable_task_command from fractal_server.app.runner.executors.slurm.sudo._subprocess_run_as_user import ( # noqa _run_command_as_user, ) from tests.fixtures_slurm import SLURM_USER +from tests.v2.test_07_full_workflow.common_functions import ( + failing_workflow_UnknownError, +) +from tests.v2.test_07_full_workflow.common_functions import full_workflow +from tests.v2.test_07_full_workflow.common_functions import ( + full_workflow_TaskExecutionError, +) +from tests.v2.test_07_full_workflow.common_functions import ( + non_executable_task_command, +) FRACTAL_RUNNER_BACKEND = "slurm"