From 2e9621e3bb500ab281e94021f58c5e2522e2ae83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Lesage?= <tlesage@teklia.com>
Date: Thu, 25 Apr 2024 11:46:55 +0200
Subject: [PATCH] Fixed broken test from proper already restarted test
---
arkindex/ponos/api.py | 4 +---
arkindex/ponos/tests/test_api.py | 10 ++++++----
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/arkindex/ponos/api.py b/arkindex/ponos/api.py
index a6ba542a10..60ae9d1725 100644
--- a/arkindex/ponos/api.py
+++ b/arkindex/ponos/api.py
@@ -223,11 +223,9 @@ class TaskRestart(ProcessACLMixin, CreateAPIView):
raise ValidationError(
detail="Task's state must be in a final state to be restarted."
)
- # TODO Check the original_task_id field directly once it is implemented
- # https://gitlab.teklia.com/arkindex/frontend/-/issues/1383
if len(Task.objects.filter(original_task=task)) > 0:
raise ValidationError(
- detail="This task has already been restarted"
+ detail="This task has already been restarted."
)
return task
diff --git a/arkindex/ponos/tests/test_api.py b/arkindex/ponos/tests/test_api.py
index fbf730f6ab..0e21aa2a62 100644
--- a/arkindex/ponos/tests/test_api.py
+++ b/arkindex/ponos/tests/test_api.py
@@ -589,14 +589,16 @@ class TestAPI(FixtureAPITestCase):
self.task1.slug = self.task1.slug + "_old1"
self.task1.state = State.Completed.value
self.task1.save()
- with self.assertNumQueries(7):
+ self.task2.original_task_id = self.task1.id
+ self.task2.save()
+ with self.assertNumQueries(8):
response = self.client.post(
reverse("api:task-restart", kwargs={"pk": str(self.task1.id)})
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
self.assertListEqual(
response.json(),
- ["This task has already been restarted"],
+ ["This task has already been restarted."],
)
@patch("arkindex.project.aws.s3")
@@ -641,7 +643,7 @@ class TestAPI(FixtureAPITestCase):
self.task2.save()
self.client.force_login(self.user)
- with self.assertNumQueries(13):
+ with self.assertNumQueries(14):
with patch("django.utils.timezone.now") as mock_now:
mock_now.return_value = datetime.now(timezone.utc) + timedelta(minutes=2)
response = self.client.post(
@@ -708,7 +710,7 @@ class TestAPI(FixtureAPITestCase):
self.task2.save()
self.client.force_login(self.user)
- with self.assertNumQueries(13):
+ with self.assertNumQueries(14):
response = self.client.post(
reverse("api:task-restart", kwargs={"pk": str(self.task2.id)})
)
--
GitLab