From fe4f7fc8ec3615f75a3865f7286a992690ecc765 Mon Sep 17 00:00:00 2001 From: Victor Seva Date: Tue, 27 Sep 2022 12:28:18 +0200 Subject: [PATCH] TT#15305 build: fix release-trunk-{version} * don't delete all history, just the last one Change-Id: I7198ebcf87d401a9ff9a3eab0fe541534903f638 --- build/test/test_rest.py | 23 +++++++++++++++++++++++ build/views.py | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/build/test/test_rest.py b/build/test/test_rest.py index 12bdb2e..d073d40 100644 --- a/build/test/test_rest.py +++ b/build/test/test_rest.py @@ -267,6 +267,29 @@ class TestTrunkCleanup(APIAuthenticatedTestCase): self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED) self.assertEqual(qs.count(), 0) + def test_weekly_not_done_with_history(self): + params = { + "uuid": "dbe569f7-eab6-4532-a6d1-d31fb559649c", + "branch": "master", + "release": "release-trunk-weekly", + "distribution": "bullseye", + "projects": "asterisk-voicemail,backup-tools", + "built_projects": "release-copy-debs-yml", + } + set_build_done( + models.BuildRelease.objects.filter(release="release-trunk-weekly") + ) + models.BuildRelease.objects.create(**params) + qs = models.BuildRelease.objects.filter(release="release-trunk-weekly") + self.assertEqual(qs.count(), 2) + url = reverse("build:trunk-cleanup", args=["release-trunk-weekly"]) + response = self.client.delete(url, {}, format="json") + self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED) + self.assertEqual(qs.count(), 1) + self.assertEqual( + qs.first().uuid, "dbe569f7-eab6-4532-a6d1-d31fb559649b" + ) + def test_weekly_done(self): qs = models.BuildRelease.objects.filter(release="release-trunk-weekly") self.assertEqual(qs.count(), 1) diff --git a/build/views.py b/build/views.py index 0b27f71..cf3bbc7 100644 --- a/build/views.py +++ b/build/views.py @@ -62,7 +62,7 @@ class BuildReleaseCleanup(APIView): if not build or build.done: return JsonResponse({}, status=200) res = model_to_dict(build) - qs.delete() + build.delete() return JsonResponse(res, status=202)