fixed merge conflicts

ministryofjustice · Feb 26, 2024 · 33288d9 · 33288d9
1 parent 510e087
commit 33288d9
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/tests/frontend/test_forms.py b/tests/frontend/test_forms.py
@@ -5,7 +5,6 @@
 import pytest
 from django.core.exceptions import ValidationError
 from django.urls import reverse
-from mock import MagicMock
 
 # First-party/Local
 from controlpanel.api import aws
@@ -454,7 +453,7 @@ def test_ip_allowlist_form_missing_name():
 @pytest.mark.parametrize("env", ["dev", "prod"])
 @mock.patch(
     "controlpanel.frontend.forms.CreateAppForm.get_datasource_queryset",
-    new=MagicMock,
+    new=mock.MagicMock,
 )
 def test_clean_namespace(env):
     form = forms.CreateAppForm()