Fix tests

Author: jmsmkn

app/tests/algorithms_tests/test_tasks.py

@@ -558,7 +558,7 @@ def test_execute_algorithm_job_sets_on_failed_jobs(
 
     # Sanity: task should run till execution
     assert len(callbacks) == 1
-    assert "ComponentJob.execute" in str(callbacks[0])
+    assert "grandchallenge.components.tasks.provision_job" in str(callbacks[0])
 
     job.refresh_from_db()
     assert job.status == Job.PENDING

app/tests/algorithms_tests/test_views.py

@@ -1684,7 +1684,11 @@ def test_create_job_with_multiple_faulty_existing_image_inputs(
 
 @pytest.mark.django_db
 def test_algorithm_image_activate(
-    settings, client, algorithm_io_image, mocker
+    settings,
+    client,
+    algorithm_io_image,
+    mocker,
+    django_capture_on_commit_callbacks,
 ):
     mocker.patch.object(
         AlgorithmImage, "calculate_size_in_registry", lambda x: 100
@@ -1711,26 +1715,29 @@ def test_algorithm_image_activate(
     editor, user = UserFactory.create_batch(2)
     alg.add_editor(editor)
 
-    response = get_view_for_user(
-        viewname="algorithms:image-activate",
-        client=client,
-        method=client.post,
-        reverse_kwargs={"slug": alg.slug},
-        data={"algorithm_image": i1.pk},
-        user=user,
-        follow=True,
-    )
+    with django_capture_on_commit_callbacks(execute=True):
+        response = get_view_for_user(
+            viewname="algorithms:image-activate",
+            client=client,
+            method=client.post,
+            reverse_kwargs={"slug": alg.slug},
+            data={"algorithm_image": i1.pk},
+            user=user,
+            follow=True,
+        )
+
     assert response.status_code == 403
 
-    response2 = get_view_for_user(
-        viewname="algorithms:image-activate",
-        client=client,
-        method=client.post,
-        reverse_kwargs={"slug": alg.slug},
-        data={"algorithm_image": i1.pk},
-        user=editor,
-        follow=True,
-    )
+    with django_capture_on_commit_callbacks(execute=True):
+        response2 = get_view_for_user(
+            viewname="algorithms:image-activate",
+            client=client,
+            method=client.post,
+            reverse_kwargs={"slug": alg.slug},
+            data={"algorithm_image": i1.pk},
+            user=editor,
+            follow=True,
+        )
 
     assert response2.status_code == 200
     i1.refresh_from_db()
@@ -1743,15 +1750,17 @@ def test_algorithm_image_activate(
     i2.is_in_registry = False
     i2.save()
 
-    response4 = get_view_for_user(
-        viewname="algorithms:image-activate",
-        client=client,
-        method=client.post,
-        reverse_kwargs={"slug": alg.slug},
-        data={"algorithm_image": i2.pk},
-        user=editor,
-        follow=True,
-    )
+    with django_capture_on_commit_callbacks(execute=True):
+        response4 = get_view_for_user(
+            viewname="algorithms:image-activate",
+            client=client,
+            method=client.post,
+            reverse_kwargs={"slug": alg.slug},
+            data={"algorithm_image": i2.pk},
+            user=editor,
+            follow=True,
+        )
+
     assert response4.status_code == 200
     assert "Image validation and upload to registry in progress." in str(
         response4.content
@@ -1760,15 +1769,18 @@ def test_algorithm_image_activate(
     i2.import_status = ImportStatusChoices.INITIALIZED
     i2.is_desired_version = False
     i2.save()
-    response6 = get_view_for_user(
-        viewname="algorithms:image-activate",
-        client=client,
-        method=client.post,
-        reverse_kwargs={"slug": alg.slug},
-        data={"algorithm_image": i2.pk},
-        user=editor,
-        follow=True,
-    )
+
+    with django_capture_on_commit_callbacks(execute=True):
+        response6 = get_view_for_user(
+            viewname="algorithms:image-activate",
+            client=client,
+            method=client.post,
+            reverse_kwargs={"slug": alg.slug},
+            data={"algorithm_image": i2.pk},
+            user=editor,
+            follow=True,
+        )
+
     assert response6.status_code == 200
     i1.refresh_from_db()
     i2.refresh_from_db()

app/tests/core_tests/test_celery.py

@@ -4,6 +4,7 @@
 from grandchallenge.core.celery import acks_late_micro_short_task
 
 
+@pytest.mark.django_db
 def test_task_errors_raised_when_invoked(
     settings, django_capture_on_commit_callbacks
 ):
@@ -23,8 +24,10 @@ def test_task():
 
     assert counter == 1
 
-    with django_capture_on_commit_callbacks(execute=True):
-        result = on_commit(test_task.apply_async)
+    with django_capture_on_commit_callbacks() as callbacks:
+        on_commit(test_task.apply_async)
+
+    result = callbacks[0]()
 
     assert result.status == "SUCCESS"
     assert counter == 2

app/tests/evaluation_tests/test_api.py

@@ -403,7 +403,13 @@ def test_update_successful_external_evaluation(
             claimed_eval.submission.creator,
         }
 
-    def test_timeout(self, client, settings, claimed_external_evaluation):
+    def test_timeout(
+        self,
+        client,
+        settings,
+        claimed_external_evaluation,
+        django_capture_on_commit_callbacks,
+    ):
         settings.EXTERNAL_EVALUATION_TIMEOUT_IN_SECONDS = 0
         settings.task_eager_propagates = (True,)
         settings.task_always_eager = (True,)
@@ -414,15 +420,17 @@ def test_timeout(self, client, settings, claimed_external_evaluation):
 
         claimed_eval = claimed_external_evaluation.evaluation
 
-        response = get_view_for_user(
-            viewname="api:evaluation-update-external-evaluation",
-            client=client,
-            method=client.patch,
-            user=claimed_external_evaluation.external_evaluator,
-            reverse_kwargs={"pk": claimed_eval.pk},
-            data={"metrics": "foo-bar", "status": "Succeeded"},
-            content_type="application/json",
-        )
+        with django_capture_on_commit_callbacks(execute=True):
+            response = get_view_for_user(
+                viewname="api:evaluation-update-external-evaluation",
+                client=client,
+                method=client.patch,
+                user=claimed_external_evaluation.external_evaluator,
+                reverse_kwargs={"pk": claimed_eval.pk},
+                data={"metrics": "foo-bar", "status": "Succeeded"},
+                content_type="application/json",
+            )
+
         assert response.status_code == 400
         assert response.json() == {
             "status": "The evaluation was not updated in time."

app/tests/profiles_tests/test_views.py

@@ -313,7 +313,12 @@ def test_one_click_unsubscribe_functionality_for_newsletter(
 )
 @pytest.mark.django_db
 def test_one_click_unsubscribe_user_mismatch(
-    client, settings, viewname, subscription_attr, new_subscription_preference
+    client,
+    settings,
+    viewname,
+    subscription_attr,
+    new_subscription_preference,
+    django_capture_on_commit_callbacks,
 ):
     # Override the celery settings
     settings.task_eager_propagates = (True,)
@@ -329,20 +334,25 @@ def test_one_click_unsubscribe_user_mismatch(
     token = user.user_profile.unsubscribe_token
 
     other_user = UserFactory()
-    response = get_view_for_user(
-        client=client,
-        method=client.post,
-        viewname=viewname,
-        reverse_kwargs={"token": token},
-        user=other_user,
-    )
+
+    with django_capture_on_commit_callbacks(execute=True):
+        response = get_view_for_user(
+            client=client,
+            method=client.post,
+            viewname=viewname,
+            reverse_kwargs={"token": token},
+            user=other_user,
+        )
+
     assert response.status_code == 302
     user.user_profile.refresh_from_db()
+
     # token owner is unsubscribed
     assert (
         getattr(user.user_profile, subscription_attr)
         == new_subscription_preference
     )
+
     # token owner and requesting user are added to a verification user set
     user_set = VerificationUserSet.objects.get()
     assert user in user_set.users.all()

app/tests/verification_tests/test_forms.py

@@ -7,6 +7,7 @@
     VerificationForm,
 )
 from tests.factories import UserFactory
+from tests.utils import get_view_for_user
 from tests.verification_tests.factories import VerificationFactory
 
 
@@ -172,7 +173,9 @@ def test_user_can_verify(self):
 
         assert form.is_valid()
 
-    def test_user_can_not_verify_other_token(self, settings):
+    def test_user_can_not_verify_other_token(
+        self, settings, client, django_capture_on_commit_callbacks
+    ):
         settings.task_eager_propagates = (True,)
         settings.task_always_eager = (True,)
 
@@ -181,12 +184,17 @@ def test_user_can_not_verify_other_token(self, settings):
 
         u2 = UserFactory()
 
-        form = ConfirmEmailForm(
-            user=u2, token=v1.token, data={"token": v1.token}
-        )
-
-        assert not form.is_valid()
-        assert ["Token is invalid"] == form.errors["token"]
+        with django_capture_on_commit_callbacks(execute=True):
+            response = get_view_for_user(
+                client=client,
+                method=client.post,
+                viewname="verifications:confirm",
+                reverse_kwargs={"token": v1.token},
+                user=u2,
+            )
+
+        assert response.status_code == 200
+        assert ["Token is invalid"] == response.context["form"].errors["token"]
 
         u1.refresh_from_db()
         u2.refresh_from_db()