diff --git a/scanpipe/tests/test_tasks.py b/scanpipe/tests/test_tasks.py index 79526dbf8..c68ecf5db 100644 --- a/scanpipe/tests/test_tasks.py +++ b/scanpipe/tests/test_tasks.py @@ -22,8 +22,8 @@ from unittest import mock -from django.conf import settings from django.test import TestCase +from django.test import override_settings from scanpipe import tasks from scanpipe.models import Project @@ -45,6 +45,7 @@ def test_scanpipe_tasks_execute_pipeline_task(self, mock_execute): self.assertIsNotNone(run.task_start_date) self.assertIsNotNone(run.task_end_date) + @override_settings(SCANCODEIO_ASYNC=False) @mock.patch("scanpipe.pipelines.Pipeline.execute") def test_scanpipe_tasks_execute_pipeline_run_next_on_success(self, mock_execute): project = Project.objects.create(name="my_project") @@ -59,11 +60,8 @@ def test_scanpipe_tasks_execute_pipeline_run_next_on_success(self, mock_execute) self.assertEqual(0, run.task_exitcode) self.assertEqual("", run.task_output) run2.refresh_from_db() - if settings.SCANCODEIO_ASYNC: - self.assertEqual(run2.Status.QUEUED, run2.status) - else: - self.assertEqual(0, run2.task_exitcode) - self.assertEqual("", run2.task_output) + self.assertEqual(0, run2.task_exitcode) + self.assertEqual("", run2.task_output) @mock.patch("scanpipe.pipelines.Pipeline.execute") def test_scanpipe_tasks_execute_pipeline_no_run_next_on_failure(self, mock_execute): @@ -87,6 +85,7 @@ def test_scanpipe_tasks_execute_pipeline_no_run_next_on_failure(self, mock_execu self.assertIsNone(run2.task_start_date) self.assertIsNone(run2.task_end_date) + @override_settings(SCANCODEIO_ASYNC=False) @mock.patch("requests.post") @mock.patch("scanpipe.pipelines.Pipeline.execute") def test_scanpipe_tasks_execute_pipeline_task_subscriptions(