From eed1f397a1b7724206d10083199ec80a993bf150 Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Fri, 8 Aug 2025 12:43:07 +0200 Subject: [PATCH 1/2] Removed a tests checking for validated tasks since we removed the validation in https://github.com/codalab/codabench/pull/1963 --- src/apps/api/tests/test_tasks.py | 64 ++++++++++++++++---------------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/src/apps/api/tests/test_tasks.py b/src/apps/api/tests/test_tasks.py index 257fa5aaa..437afe04f 100644 --- a/src/apps/api/tests/test_tasks.py +++ b/src/apps/api/tests/test_tasks.py @@ -6,49 +6,49 @@ from competitions.models import Submission from factories import UserFactory, CompetitionFactory, TaskFactory, SolutionFactory, PhaseFactory, SubmissionFactory, DataFactory - -class TestTasks(APITestCase): - def test_task_shown_as_validated_properly(self): - user = UserFactory(username='test') - solution = SolutionFactory(md5="12345") - task = TaskFactory(created_by=user, solutions=[solution]) - competition = CompetitionFactory(created_by=user) - phase = PhaseFactory(competition=competition, tasks=[task]) - submission = SubmissionFactory(md5="12345", phase=phase, status=Submission.FINISHED) - url = reverse('task-detail', kwargs={'pk': task.id}) - self.client.login(username=user.username, password='test') +# Removed this test because of the changes of this PR : https://github.com/codalab/codabench/pull/1963 +#class TestTasks(APITestCase): + #def test_task_shown_as_validated_properly(self): + # user = UserFactory(username='test') + # solution = SolutionFactory(md5="12345") + # task = TaskFactory(created_by=user, solutions=[solution]) + # competition = CompetitionFactory(created_by=user) + # phase = PhaseFactory(competition=competition, tasks=[task]) + # submission = SubmissionFactory(md5="12345", phase=phase, status=Submission.FINISHED) + # url = reverse('task-detail', kwargs={'pk': task.id}) + # self.client.login(username=user.username, password='test') # task should be validated because we have a successful submission matching # our solution - resp = self.client.get(url) - assert resp.status_code == 200 - assert resp.data["validated"] + # resp = self.client.get(url) + # assert resp.status_code == 200 + # assert resp.data["validated"] # make submission anything but Submission.FINISHED, task -> invalidated - submission.status = Submission.FAILED - submission.save() - resp = self.client.get(url) - assert resp.status_code == 200 - assert not resp.data["validated"] + # submission.status = Submission.FAILED + # submission.save() + # resp = self.client.get(url) + # assert resp.status_code == 200 + # assert not resp.data["validated"] # make submission Submission.Finished, task -> re-validated - submission.status = Submission.FINISHED - submission.save() - resp = self.client.get(url) - assert resp.status_code == 200 - assert resp.data["validated"] + # submission.status = Submission.FINISHED + # submission.save() + # resp = self.client.get(url) + # assert resp.status_code == 200 + # assert resp.data["validated"] # delete submission, task -> re-invalidated - submission.delete() - resp = self.client.get(url) - assert resp.status_code == 200 - assert not resp.data["validated"] + # submission.delete() + # resp = self.client.get(url) + # assert resp.status_code == 200 + # assert not resp.data["validated"] # make submission with different Sha -> still invalid - SubmissionFactory(md5="different", phase=phase, status=Submission.FINISHED) - resp = self.client.get(url) - assert resp.status_code == 200 - assert not resp.data["validated"] + # SubmissionFactory(md5="different", phase=phase, status=Submission.FINISHED) + # resp = self.client.get(url) + # assert resp.status_code == 200 + # assert not resp.data["validated"] class TestUploadTask(APITestCase): From ba51a0dbaabdb7431ab3819dfd67ac4a3ba36130 Mon Sep 17 00:00:00 2001 From: Obada Haddad Date: Fri, 8 Aug 2025 12:52:12 +0200 Subject: [PATCH 2/2] Flake8 fixes --- src/apps/api/tests/test_tasks.py | 87 ++++++++++++++++---------------- 1 file changed, 43 insertions(+), 44 deletions(-) diff --git a/src/apps/api/tests/test_tasks.py b/src/apps/api/tests/test_tasks.py index 437afe04f..7b00b76cc 100644 --- a/src/apps/api/tests/test_tasks.py +++ b/src/apps/api/tests/test_tasks.py @@ -3,52 +3,51 @@ from rest_framework.test import APITestCase from rest_framework import status -from competitions.models import Submission -from factories import UserFactory, CompetitionFactory, TaskFactory, SolutionFactory, PhaseFactory, SubmissionFactory, DataFactory +from factories import UserFactory, DataFactory # Removed this test because of the changes of this PR : https://github.com/codalab/codabench/pull/1963 -#class TestTasks(APITestCase): - #def test_task_shown_as_validated_properly(self): - # user = UserFactory(username='test') - # solution = SolutionFactory(md5="12345") - # task = TaskFactory(created_by=user, solutions=[solution]) - # competition = CompetitionFactory(created_by=user) - # phase = PhaseFactory(competition=competition, tasks=[task]) - # submission = SubmissionFactory(md5="12345", phase=phase, status=Submission.FINISHED) - # url = reverse('task-detail', kwargs={'pk': task.id}) - # self.client.login(username=user.username, password='test') - - # task should be validated because we have a successful submission matching - # our solution - # resp = self.client.get(url) - # assert resp.status_code == 200 - # assert resp.data["validated"] - - # make submission anything but Submission.FINISHED, task -> invalidated - # submission.status = Submission.FAILED - # submission.save() - # resp = self.client.get(url) - # assert resp.status_code == 200 - # assert not resp.data["validated"] - - # make submission Submission.Finished, task -> re-validated - # submission.status = Submission.FINISHED - # submission.save() - # resp = self.client.get(url) - # assert resp.status_code == 200 - # assert resp.data["validated"] - - # delete submission, task -> re-invalidated - # submission.delete() - # resp = self.client.get(url) - # assert resp.status_code == 200 - # assert not resp.data["validated"] - - # make submission with different Sha -> still invalid - # SubmissionFactory(md5="different", phase=phase, status=Submission.FINISHED) - # resp = self.client.get(url) - # assert resp.status_code == 200 - # assert not resp.data["validated"] +# class TestTasks(APITestCase): +# def test_task_shown_as_validated_properly(self): +# user = UserFactory(username='test') +# solution = SolutionFactory(md5="12345") +# task = TaskFactory(created_by=user, solutions=[solution]) +# competition = CompetitionFactory(created_by=user) +# phase = PhaseFactory(competition=competition, tasks=[task]) +# submission = SubmissionFactory(md5="12345", phase=phase, status=Submission.FINISHED) +# url = reverse('task-detail', kwargs={'pk': task.id}) +# self.client.login(username=user.username, password='test') + +# # task should be validated because we have a successful submission matching +# # our solution +# resp = self.client.get(url) +# assert resp.status_code == 200 +# assert resp.data["validated"] + +# # make submission anything but Submission.FINISHED, task -> invalidated +# submission.status = Submission.FAILED +# submission.save() +# resp = self.client.get(url) +# assert resp.status_code == 200 +# assert not resp.data["validated"] + +# # make submission Submission.Finished, task -> re-validated +# submission.status = Submission.FINISHED +# submission.save() +# resp = self.client.get(url) +# assert resp.status_code == 200 +# assert resp.data["validated"] + +# # delete submission, task -> re-invalidated +# submission.delete() +# resp = self.client.get(url) +# assert resp.status_code == 200 +# assert not resp.data["validated"] + +# # make submission with different Sha -> still invalid +# SubmissionFactory(md5="different", phase=phase, status=Submission.FINISHED) +# resp = self.client.get(url) +# assert resp.status_code == 200 +# assert not resp.data["validated"] class TestUploadTask(APITestCase):