Merge pull request #1090 from fractal-analytics-platform/1078-improve…

…-testing-of-db-models Improve testing of db models
fractal-analytics-platform · Dec 19, 2023 · 6172a19 · 6172a19
2 parents c13db0d + 3ab3f43
commit 6172a19
Show file tree

Hide file tree

Showing 27 changed files with 915 additions and 362 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@ Warning: this update requires running some fix-db scripts (more details TBD - se
 
 * Database:
     * Add `ApplyWorkflow.project_dump` column (\#1070).
+* Testing:
+   * Extended systematic testing of database models (\#1078).
 
 # 1.4.1
 

diff --git a/tests/test_admin_api.py → tests/api/test_admin_api.py b/tests/test_admin_api.py → tests/api/test_admin_api.py
diff --git a/tests/test_alive.py → tests/api/test_alive.py b/tests/test_alive.py → tests/api/test_alive.py
diff --git a/tests/test_dataset_api.py → tests/api/test_dataset_api.py b/tests/test_dataset_api.py → tests/api/test_dataset_api.py
@@ -175,7 +175,7 @@ async def test_delete_dataset(
         assert datasets[0]["id"] == ds1.id
 
 
-async def test_delete_dataset_failure(
+async def test_delete_dataset_cascade_jobs(
     db,
     MockCurrentUser,
     project_factory,

diff --git a/tests/test_job_api.py → tests/api/test_job_api.py b/tests/test_job_api.py → tests/api/test_job_api.py
diff --git a/tests/test_project_api.py → tests/api/test_project_api.py b/tests/test_project_api.py → tests/api/test_project_api.py
diff --git a/tests/test_project_apply_api.py → tests/api/test_project_apply_api.py b/tests/test_project_apply_api.py → tests/api/test_project_apply_api.py
diff --git a/tests/test_task_api.py → tests/api/test_task_api.py b/tests/test_task_api.py → tests/api/test_task_api.py
diff --git a/tests/test_task_collection_api.py → tests/api/test_task_collection_api.py b/tests/test_task_collection_api.py → tests/api/test_task_collection_api.py
@@ -9,7 +9,6 @@
 from devtools import debug
 from sqlmodel import select
 
-from .fixtures_tasks import execute_command
 from fractal_server.app.models import State
 from fractal_server.app.models import Task
 from fractal_server.app.routes.api.v1.task_collection import (
@@ -25,6 +24,7 @@
 from fractal_server.tasks.collection import get_collection_path
 from fractal_server.tasks.collection import get_log_path
 from fractal_server.tasks.collection import inspect_package
+from tests.fixtures_tasks import execute_command
 
 PREFIX = "/api/v1/task"
 

diff --git a/tests/test_unit_aux_functions.py → tests/api/test_unit_aux_functions.py b/tests/test_unit_aux_functions.py → tests/api/test_unit_aux_functions.py
diff --git a/tests/test_workflow_api.py → tests/api/test_workflow_api.py b/tests/test_workflow_api.py → tests/api/test_workflow_api.py
diff --git a/tests/test_backend_local.py → tests/backend/test_backend_local.py b/tests/test_backend_local.py → tests/backend/test_backend_local.py
@@ -18,10 +18,6 @@
 import pytest
 from devtools import debug
 
-from .data.tasks_dummy import dummy as dummy_module
-from .data.tasks_dummy import dummy_parallel as dummy_parallel_module
-from .fixtures_tasks import MockTask
-from .fixtures_tasks import MockWorkflowTask
 from fractal_server.app.runner._common import _call_command_wrapper
 from fractal_server.app.runner._common import call_parallel_task
 from fractal_server.app.runner._common import call_single_task
@@ -32,6 +28,10 @@
 from fractal_server.app.runner.common import TaskParameters
 from fractal_server.app.schemas import WorkflowTaskStatusType
 from fractal_server.logger import set_logger
+from tests.data.tasks_dummy import dummy as dummy_module
+from tests.data.tasks_dummy import dummy_parallel as dummy_parallel_module
+from tests.fixtures_tasks import MockTask
+from tests.fixtures_tasks import MockWorkflowTask
 
 
 async def test_command_wrapper(tmp_path):

diff --git a/tests/test_backend_local_custom_task.py → ...backend/test_backend_local_custom_task.py b/tests/test_backend_local_custom_task.py → ...backend/test_backend_local_custom_task.py
diff --git a/tests/test_backend_runners.py → tests/backend/test_backend_runners.py b/tests/test_backend_runners.py → tests/backend/test_backend_runners.py
diff --git a/tests/test_backend_slurm.py → tests/backend/test_backend_slurm.py b/tests/test_backend_slurm.py → tests/backend/test_backend_slurm.py
@@ -6,13 +6,13 @@
 import pytest
 from devtools import debug
 
-from .fixtures_slurm import run_squeue
-from .fixtures_slurm import scancel_all_jobs_of_a_slurm_user
 from fractal_server.app.runner._slurm.executor import (
     FractalSlurmExecutor,
 )  # noqa
 from fractal_server.app.runner.common import JobExecutionError
 from fractal_server.app.runner.common import TaskExecutionError
+from tests.fixtures_slurm import run_squeue
+from tests.fixtures_slurm import scancel_all_jobs_of_a_slurm_user
 
 
 def test_slurm_executor_submit(

diff --git a/tests/test_backend_slurm_shutdown.py → tests/backend/test_backend_slurm_shutdown.py b/tests/test_backend_slurm_shutdown.py → tests/backend/test_backend_slurm_shutdown.py
@@ -5,9 +5,9 @@
 import pytest
 from devtools import debug
 
-from .fixtures_slurm import run_squeue
 from fractal_server.app.runner._slurm.executor import FractalSlurmExecutor
 from fractal_server.app.runner.common import JobExecutionError
+from tests.fixtures_slurm import run_squeue
 
 
 def test_direct_shutdown_during_submit(

diff --git a/tests/test_unit_custom_subprocess_module.py → ...end/test_unit_custom_subprocess_module.py b/tests/test_unit_custom_subprocess_module.py → ...end/test_unit_custom_subprocess_module.py
diff --git a/...test_unit_fractal_thread_pool_executor.py → ...test_unit_fractal_thread_pool_executor.py b/...test_unit_fractal_thread_pool_executor.py → ...test_unit_fractal_thread_pool_executor.py
diff --git a/tests/test_unit_local_config.py → tests/backend/test_unit_local_config.py b/tests/test_unit_local_config.py → tests/backend/test_unit_local_config.py
@@ -3,14 +3,14 @@
 import pytest
 from devtools import debug
 
-from .fixtures_tasks import MockTask
-from .fixtures_tasks import MockWorkflowTask
 from fractal_server.app.runner._local._local_config import (
     get_local_backend_config,
 )
 from fractal_server.app.runner._local._local_config import (
     LocalBackendConfigError,
 )
+from tests.fixtures_tasks import MockTask
+from tests.fixtures_tasks import MockWorkflowTask
 
 
 def test_get_local_backend_config(tmp_path):

diff --git a/tests/test_unit_slurm_batching.py → tests/backend/test_unit_slurm_batching.py b/tests/test_unit_slurm_batching.py → tests/backend/test_unit_slurm_batching.py
diff --git a/tests/test_unit_slurm_config.py → tests/backend/test_unit_slurm_config.py b/tests/test_unit_slurm_config.py → tests/backend/test_unit_slurm_config.py
@@ -3,14 +3,14 @@
 import pytest
 from devtools import debug
 
-from .fixtures_tasks import MockTask
-from .fixtures_tasks import MockWorkflowTask
 from fractal_server.app.runner._slurm._slurm_config import _parse_mem_value
 from fractal_server.app.runner._slurm._slurm_config import (
     get_default_slurm_config,
 )
 from fractal_server.app.runner._slurm._slurm_config import get_slurm_config
 from fractal_server.app.runner._slurm._slurm_config import SlurmConfigError
+from tests.fixtures_tasks import MockTask
+from tests.fixtures_tasks import MockWorkflowTask
 
 
 @pytest.mark.parametrize("fail", [True, False])

diff --git a/tests/test_db.py → tests/db/test_db.py b/tests/test_db.py → tests/db/test_db.py
@@ -1,7 +1,7 @@
 import pytest
 from devtools import debug
 
-from .fixtures_server import DB_ENGINE
+from tests.fixtures_server import DB_ENGINE
 
 
 async def test_db_connection(db):

diff --git a/tests/test_link_project_user.py → tests/db/test_link_project_user.py b/tests/test_link_project_user.py → tests/db/test_link_project_user.py