chore(api): adjust request tests method names

api/desecapi/tests/base.py

@@ -609,7 +609,7 @@ class MockPDNSTestCase(APITestCase):
             "priority": 1,  # avoid collision with DELETE zones/(?P<id>[^/]+)$ (httpretty does not match the method)
         }
 
-    def assertPdnsRequests(self, *expected_requests, expect_order=True, exit_hook=None):
+    def assertRequests(self, *expected_requests, expect_order=True, exit_hook=None):
         """
         Assert the given requests are made. To build requests, use the `MockPDNSTestCase.request_*` functions.
         Unmet expectations will fail the test.
@@ -625,7 +625,7 @@ class MockPDNSTestCase(APITestCase):
             exit_hook=exit_hook,
         )
 
-    def assertPdnsNoRequestsBut(self, *expected_requests):
+    def assertNoRequestsBut(self, *expected_requests):
         """
         Assert no requests other than the given ones are made. Each request can be matched more than once, unmatched
         expectations WILL NOT fail the test.
@@ -639,7 +639,7 @@ class MockPDNSTestCase(APITestCase):
             expect_order=False,
         )
 
-    def assertPdnsZoneCreation(self):
+    def assertZoneCreation(self):
         """
         Asserts that nslord is contact and a zone is created.
         """
@@ -651,7 +651,7 @@ class MockPDNSTestCase(APITestCase):
             ],
         )
 
-    def assertPdnsZoneDeletion(self, name=None):
+    def assertZoneDeletion(self, name=None):
         """
         Asserts that nslord and nsmaster are contacted to delete a zone.
         Args:
@@ -1301,7 +1301,7 @@ class DynDomainOwnerTestCase(DomainOwnerTestCase):
         return super().request_pdns_zone_update(name.lower() if name else None)
 
     def _assertDynDNS12Update(self, requests, mock_remote_addr="", **kwargs):
-        with self.assertPdnsRequests(requests):
+        with self.assertRequests(requests):
             if mock_remote_addr:
                 return self.client.get(
                     self.reverse("v1:dyndns12update"),

api/desecapi/tests/test_authentication.py

@@ -13,7 +13,7 @@ class DynUpdateAuthenticationTestCase(DynDomainOwnerTestCase):
     NUM_OWNED_DOMAINS = 1
 
     def _get_dyndns12(self):
-        with self.assertPdnsNoRequestsBut(self.requests_desec_rr_sets_update()):
+        with self.assertNoRequestsBut(self.requests_desec_rr_sets_update()):
             return self.client.get(self.reverse("v1:dyndns12update"))
 
     def assertDynDNS12Status(self, code=HTTP_200_OK, authorization=None):

api/desecapi/tests/test_domains.py

@@ -218,7 +218,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
             "hyphen-.example.com",
             "max.length.x01234567890123456789012345678901234567890123456789012345678901.com",
         ]:
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_domain_creation(
                     name=name, keys=False
                 )  # no serializer, no cryptokeys API call
@@ -270,9 +270,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
     def test_delete_my_domain(self):
         url = self.reverse("v1:domain-detail", name=self.my_domain.name)
 
-        with self.assertPdnsRequests(
-            self.requests_desec_domain_deletion(self.my_domain)
-        ):
+        with self.assertRequests(self.requests_desec_domain_deletion(self.my_domain)):
             response = self.client.delete(url)
             self.assertStatus(response, status.HTTP_204_NO_CONTENT)
             self.assertFalse(Domain.objects.filter(pk=self.my_domain.pk).exists())
@@ -288,7 +286,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
 
     def test_retrieve_my_domain(self):
         url = self.reverse("v1:domain-detail", name=self.my_domain.name)
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_retrieve_crypto_keys(name=self.my_domain.name)
         ):
             response = self.client.get(url)
@@ -302,7 +300,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
 
     def test_zonefile_my_domain(self):
         url = self.reverse("v1:domain-detail", name=self.my_domain.name) + "zonefile/"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_retrieve_zone_export(name=self.my_domain.name)
         ):
             response = self.client.get(url)
@@ -322,7 +320,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
 
     def test_update_domain(self):
         url = self.reverse("v1:domain-detail", name=self.my_domain.name)
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_retrieve_crypto_keys(name=self.my_domain.name)
         ):
             response = self.client.get(url)
@@ -341,7 +339,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
             self.random_domain_name(),
             "xn--90aeeb7afyklt.xn--p1ai",
         ]:
-            with self.assertPdnsRequests(self.requests_desec_domain_creation(name)):
+            with self.assertRequests(self.requests_desec_domain_creation(name)):
                 response = self.client.post(
                     self.reverse("v1:domain-list"), {"name": name}
                 )
@@ -362,9 +360,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
                 self.assertEqual(len(mail.outbox), 0)
                 self.assertTrue(isinstance(response.data["keys"], list))
 
-            with self.assertPdnsRequests(
-                self.request_pdns_zone_retrieve_crypto_keys(name)
-            ):
+            with self.assertRequests(self.request_pdns_zone_retrieve_crypto_keys(name)):
                 self.assertStatus(
                     self.client.get(
                         self.reverse("v1:domain-detail", name=name), {"name": name}
@@ -411,7 +407,7 @@ localhost.import-me.example A 127.0.0.1
 # show zone import-me.example
 """
         name = "import-me.example"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, axfr=False, keys=False)
             + self.requests_desec_rr_sets_update(name)
             + [self.request_pdns_zone_retrieve_crypto_keys(name)]
@@ -528,7 +524,7 @@ import-me.example A 127.0.0.1
 inject.{self.other_domain.name}. CNAME a.example.
 """
         name = "import-me.example"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, axfr=False, keys=False)
             + self.requests_desec_rr_sets_update(name)
             + [self.request_pdns_zone_retrieve_crypto_keys(name)]
@@ -549,7 +545,7 @@ import-me.example A 127.0.0.2
 import-me.example MX 10 example.com.
 """
         name = "import-me.example"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, axfr=False, keys=False)
             + self.requests_desec_rr_sets_update(name)
             + [self.request_pdns_zone_retrieve_crypto_keys(name)]
@@ -572,7 +568,7 @@ example.net. 3600 MX 10 mail.example.org.
 example.net. 3600 PTR mail.example.net.
 example.net. 3600 PTR mail.example.org."""
         name = "example.net"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, axfr=False, keys=False)
             + self.requests_desec_rr_sets_update(name)
             + [self.request_pdns_zone_retrieve_crypto_keys(name)]
@@ -600,7 +596,7 @@ $TTL 43200 ; 12 hours
 import-me.example AAAA 0000::1
 """
         name = "import-me.example"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, axfr=False, keys=False)
             + self.requests_desec_rr_sets_update(name)
             + [self.request_pdns_zone_retrieve_crypto_keys(name)]
@@ -664,7 +660,7 @@ import-me.example A 127.0.0.1
 import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6ZrLLLm6ZpvCh/vyqWCEkf2Krwkt8 Fi1/VJgfLMoXZSj6koOzJBMYYCiMm0JP WgQwG54fcw6YJQaOfWX1BA==
 """
         name = "import-me.example"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, axfr=False, keys=False)
             + self.requests_desec_rr_sets_update(name)
             + [self.request_pdns_zone_retrieve_crypto_keys(name)]
@@ -681,7 +677,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
 
     def test_create_domain_zonefile_empty(self):
         name = "import-me.example"
-        with self.assertPdnsRequests(self.requests_desec_domain_creation(name)):
+        with self.assertRequests(self.requests_desec_domain_creation(name)):
             response = self.client.post(
                 self.reverse("v1:domain-list"), {"name": name, "zonefile": ""}
             )
@@ -694,7 +690,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
             self.random_domain_name(),
             "www." + self.my_domain.name,
         ]:
-            with self.assertPdnsRequests(self.requests_desec_domain_creation(name)):
+            with self.assertRequests(self.requests_desec_domain_creation(name)):
                 response = self.client.post(url, {"name": name})
                 self.assertStatus(response, status.HTTP_201_CREATED)
             response = self.client.post(url, {"name": name})
@@ -720,7 +716,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
 
     def test_create_domain_under_public_suffix_with_private_parent(self):
         name = "amazonaws.com"
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation(name, keys=False)
         ), PDNSChangeTracker():
             Domain(owner=self.create_user(), name=name).save()
@@ -736,7 +732,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
         # registered even if the parent zone amazonaws.com is owned by another user
         name = "test.s3.amazonaws.com"
         psl_cm = self.get_psl_context_manager("s3.amazonaws.com")
-        with psl_cm, self.assertPdnsRequests(self.requests_desec_domain_creation(name)):
+        with psl_cm, self.assertRequests(self.requests_desec_domain_creation(name)):
             response = self.client.post(self.reverse("v1:domain-list"), {"name": name})
             self.assertStatus(response, status.HTTP_201_CREATED)
 
@@ -762,7 +758,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
 
     def test_create_domain_atomicity(self):
         name = self.random_domain_name()
-        with self.assertPdnsRequests(self.request_pdns_zone_create_422()):
+        with self.assertRequests(self.request_pdns_zone_create_422()):
             with self.assertRaises(ValueError):
                 self.client.post(self.reverse("v1:domain-list"), {"name": name})
             self.assertFalse(Domain.objects.filter(name=name).exists())
@@ -776,9 +772,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
             )
 
         for name in [n.encode("idna").decode("ascii") for n in names]:
-            with self.assertPdnsRequests(
-                self.requests_desec_domain_creation(name=name)
-            ):
+            with self.assertRequests(self.requests_desec_domain_creation(name=name)):
                 self.assertStatus(
                     self.client.post(self.reverse("v1:domain-list"), {"name": name}),
                     status.HTTP_201_CREATED,
@@ -807,7 +801,7 @@ import-me.example RRSIG A 13 2 3600 20220324000000 20220303000000 40316 @ 4wj6Zr
     def test_domain_minimum_ttl(self):
         url = self.reverse("v1:domain-list")
         name = self.random_domain_name()
-        with self.assertPdnsRequests(self.requests_desec_domain_creation(name=name)):
+        with self.assertRequests(self.requests_desec_domain_creation(name=name)):
             response = self.client.post(url, {"name": name})
         self.assertStatus(response, status.HTTP_201_CREATED)
         self.assertEqual(response.data["minimum_ttl"], settings.MINIMUM_TTL_DEFAULT)
@@ -818,7 +812,7 @@ class AutoDelegationDomainOwnerTests(DomainOwnerTestCase):
 
     def test_delete_my_domain(self):
         url = self.reverse("v1:domain-detail", name=self.my_domain.name)
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_deletion(domain=self.my_domain)
         ):
             response = self.client.delete(url)
@@ -829,7 +823,7 @@ class AutoDelegationDomainOwnerTests(DomainOwnerTestCase):
 
     def test_delete_other_domains(self):
         url = self.reverse("v1:domain-detail", name=self.other_domain.name)
-        with self.assertPdnsRequests():
+        with self.assertRequests():
             response = self.client.delete(url)
             self.assertStatus(response, status.HTTP_204_NO_CONTENT)
             self.assertTrue(Domain.objects.filter(pk=self.other_domain.pk).exists())
@@ -837,7 +831,7 @@ class AutoDelegationDomainOwnerTests(DomainOwnerTestCase):
     def test_create_auto_delegated_domains(self):
         for i, suffix in enumerate(self.AUTO_DELEGATION_DOMAINS):
             name = self.random_domain_name(suffix)
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_domain_creation_auto_delegation(name=name)
             ):
                 response = self.client.post(
@@ -856,7 +850,7 @@ class AutoDelegationDomainOwnerTests(DomainOwnerTestCase):
 
         for i in range(user_quota):
             name = self.random_domain_name(self.AUTO_DELEGATION_DOMAINS)
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_domain_creation_auto_delegation(name)
             ):
                 response = self.client.post(url, {"name": name})
@@ -873,7 +867,7 @@ class AutoDelegationDomainOwnerTests(DomainOwnerTestCase):
     def test_domain_minimum_ttl(self):
         url = self.reverse("v1:domain-list")
         name = self.random_domain_name(self.AUTO_DELEGATION_DOMAINS)
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_domain_creation_auto_delegation(name)
         ):
             response = self.client.post(url, {"name": name})

api/desecapi/tests/test_dyndns12update.py

@@ -62,7 +62,7 @@ class DynDNS12UpdateTest(DynDomainOwnerTestCase):
         a record with a different TTL beforehand and then make sure that
         updates still work properly.
         """
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_update(self.my_domain.name),
             self.request_pdns_zone_axfr(self.my_domain.name),
         ):
@@ -78,7 +78,7 @@ class DynDNS12UpdateTest(DynDomainOwnerTestCase):
 
     def test_ddclient_dyndns1_v4_success(self):
         # /nic/dyndns?action=edit&started=1&hostname=YES&host_id=foobar.dedyn.io&myip=10.1.2.3
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_update(self.my_domain.name),
             self.request_pdns_zone_axfr(self.my_domain.name),
         ):

api/desecapi/tests/test_pdns_change_tracker.py

@@ -24,7 +24,7 @@ class PdnsChangeTrackerTestCase(DesecTestCase):
         )
 
     def assertPdnsZoneUpdate(self, name, rr_sets):
-        return self.assertPdnsRequests(
+        return self.assertRequests(
             [
                 self.request_pdns_zone_update_assert_body(name, rr_sets),
                 self.request_pdns_zone_axfr(name),
@@ -579,7 +579,7 @@ class DomainTestCase(PdnsChangeTrackerTestCase):
 
     def test_create(self):
         name = self.random_domain_name()
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             [
                 self.request_pdns_zone_create("LORD"),
                 self.request_pdns_zone_create("MASTER"),
@@ -604,13 +604,13 @@ class DomainTestCase(PdnsChangeTrackerTestCase):
 
     def test_delete_single(self):
         for domain in self.domains:
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_domain_deletion(domain)
             ), PDNSChangeTracker():
                 domain.delete()
 
     def test_delete_multiple(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             [
                 self.requests_desec_domain_deletion(domain)
                 for domain in reversed(self.domains)

api/desecapi/tests/test_replication.py

@@ -27,7 +27,7 @@ class ReplicationTest(DesecTestCase):
             response = self.client.get(path=url, REMOTE_ADDR="123.8.0.2")
             self.assertStatus(response, status.HTTP_401_UNAUTHORIZED)
 
-            with self.assertPdnsRequests(pdns_requests):
+            with self.assertRequests(pdns_requests):
                 response = self.client.get(path=url, REMOTE_ADDR="10.8.0.2")
             self.assertStatus(response, status.HTTP_200_OK)
             self.assertEqual(response.data, serials)

api/desecapi/tests/test_rrsets.py

@@ -199,7 +199,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                 if data["subname"] is None:
                     data.pop("subname")
 
-                with self.assertPdnsRequests(
+                with self.assertRequests(
                     self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
                 ):
                     response = self.client.post_rr_set(
@@ -399,7 +399,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
 
     def test_create_my_rr_sets_chunk_too_long(self):
         for l, t in product([1, 255, 256, 498], ["TXT", "SPF"]):
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(self.my_empty_domain.name)
             ):
                 response = self.client.post_rr_set(
@@ -407,7 +407,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                     **self._create_test_txt_record(f'"{"A" * l}"', t),
                 )
                 self.assertStatus(response, status.HTTP_201_CREATED)
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(self.my_empty_domain.name)
             ):
                 self.client.delete_rr_set(
@@ -447,7 +447,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                 str(response.data),
             )
 
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             response = self.client.post_rr_set(
@@ -475,7 +475,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
 
     def test_create_my_rr_sets_twice(self):
         data = {"records": ["1.2.3.4"], "ttl": 3660, "type": "A"}
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             response = self.client.post_rr_set(self.my_empty_domain.name, **data)
@@ -782,7 +782,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                 continue
             subname = "" if t == "DNSKEY" else "test"
             data = {"records": [record], "ttl": 3660, "type": t, "subname": subname}
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
             ):
                 response = self.client.post_rr_set(self.my_empty_domain.name, **data)
@@ -793,7 +793,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                     f"For RR set type {t}, expected '{canonical_record}' to be the canonical form of "
                     f'\'{record}\', but saw \'{response.data["records"][0]}\'.',
                 )
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
             ):
                 response = self.client.delete_rr_set(
@@ -925,14 +925,14 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
             subname = "" if t == "DNSKEY" else "test"
             for r in records:
                 data = {"records": [r], "ttl": 3660, "type": t, "subname": subname}
-                with self.assertPdnsRequests(
+                with self.assertRequests(
                     self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
                 ):
                     response = self.client.post_rr_set(
                         self.my_empty_domain.name, **data
                     )
                     self.assertStatus(response, status.HTTP_201_CREATED)
-                with self.assertPdnsRequests(
+                with self.assertRequests(
                     self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
                 ):
                     response = self.client.delete_rr_set(
@@ -1090,7 +1090,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
     def test_create_my_rr_sets_no_ip_block_unless_lps(self):
         # IP block should not be effective unless domain is under Local Public Suffix
         BlockedSubnet.from_ip("3.2.2.3").save()
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
         ):
             response = self.client.post_rr_set(
@@ -1111,7 +1111,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                     "type": t,
                     "subname": f"x{l}",
                 }
-                with self.assertPdnsRequests(
+                with self.assertRequests(
                     self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
                 ):
                     response = self.client.post_rr_set(
@@ -1156,7 +1156,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
         self.assertEqual(response.data["ttl"][0], detail)
 
         ttl += 1
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
         ):
             response = self.client.post_rr_set(
@@ -1173,7 +1173,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
         detail = f"Ensure this value is less than or equal to {max_ttl}."
         self.assertEqual(response.data["ttl"][0], detail)
 
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
         ):
             response = self.client.post_rr_set(
@@ -1200,7 +1200,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
 
     def test_update_my_rr_sets(self):
         for subname in self.SUBNAMES:
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(name=self.my_rr_set_domain.name)
             ):
                 data = {
@@ -1264,7 +1264,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
                 {"records": ["3.2.3.4", "9.8.8.7"]},
                 {"ttl": 3637},
             ]:
-                with self.assertPdnsRequests(
+                with self.assertRequests(
                     self.requests_desec_rr_sets_update(name=self.my_rr_set_domain.name)
                 ):
                     response = self.client.patch_rr_set(
@@ -1367,7 +1367,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
 
         # This is expected to work, but the fields are ignored
         data = {"records": ["3.2.3.4"], "name": "example.com.", "domain": "example.com"}
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_rr_set_domain.name)
         ):
             response = self.client.patch(url, data)
@@ -1399,7 +1399,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
     def test_delete_my_rr_sets_with_patch(self):
         data = {"records": []}
         for subname in self.SUBNAMES:
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(name=self.my_rr_set_domain.name)
             ):
                 response = self.client.patch_rr_set(
@@ -1419,7 +1419,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
 
     def test_delete_my_rr_sets_with_delete(self):
         for subname in self.SUBNAMES:
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_rr_sets_update(name=self.my_rr_set_domain.name)
             ):
                 response = self.client.delete_rr_set(
@@ -1463,7 +1463,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
             )
 
     def test_import_rr_sets(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_retrieve(name=self.my_domain.name)
         ):
             call_command("sync-from-pdns", self.my_domain.name)
@@ -1502,7 +1502,7 @@ class AuthenticatedRRSetTestCase(AuthenticatedRRSetBaseTestCase):
         )
 
         url = self.reverse("v1:domain-detail", name=domain.name)
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.request_pdns_zone_retrieve_crypto_keys(name=domain.name)
         ):
             response = self.client.get(url)

api/desecapi/tests/test_rrsets_bulk.py

@@ -52,7 +52,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
             cls.create_rr_set(cls.bulk_domain, **data)
 
     def test_bulk_post_my_rr_sets(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
         ):
             response = self.client.bulk_post_rr_sets(
@@ -264,7 +264,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
         self.assertStatus(response, status.HTTP_400_BAD_REQUEST)
         self.assertEqual(response.data, [{}, {"records": ["This field is required."]}])
 
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             response = self.client.bulk_patch_rr_sets(
@@ -330,7 +330,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
             ttl=3600,
         )
 
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             response = self.client.bulk_patch_rr_sets(
@@ -351,7 +351,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
             self.assertEqual(response.data[0]["records"], ["example.com."])
             self.assertEqual(response.data[0]["ttl"], 3605)
 
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             response = self.client.bulk_patch_rr_sets(
@@ -374,7 +374,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
 
     def test_bulk_patch_full_on_empty_domain(self):
         # Full patch always works
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
         ):
             response = self.client.bulk_patch_rr_sets(
@@ -390,7 +390,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
     def test_bulk_patch_change_records(self):
         data_no_ttl = copy.deepcopy(self.data_no_ttl)
         data_no_ttl[0]["records"] = ["example.org."]
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.bulk_domain.name)
         ):
             response = self.client.bulk_patch_rr_sets(
@@ -405,7 +405,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
     def test_bulk_patch_change_ttl(self):
         data_no_records = copy.deepcopy(self.data_no_records)
         data_no_records[1]["ttl"] = 3911
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.bulk_domain.name)
         ):
             response = self.client.bulk_patch_rr_sets(
@@ -439,7 +439,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
         )
 
     def test_bulk_patch_missing_invalid_fields_1(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             self.client.bulk_post_rr_sets(
@@ -491,7 +491,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
         )
 
     def test_bulk_patch_missing_invalid_fields_2(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(self.my_empty_domain.name)
         ):
             self.client.bulk_post_rr_sets(
@@ -659,7 +659,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
 
     def test_bulk_put_full(self):
         # Full PUT always works
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_empty_domain.name)
         ):
             response = self.client.bulk_put_rr_sets(
@@ -696,7 +696,7 @@ class AuthenticatedRRSetBulkTestCase(AuthenticatedRRSetBaseTestCase):
             self.assertTrue("records" in response.data[0])
 
     def test_bulk_put_empty_records(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.bulk_domain.name)
         ):
             self.assertStatus(

api/desecapi/tests/test_stop_abuse.py

@@ -35,7 +35,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         management.call_command("stop-abuse")
 
     def test_remove_rrsets_by_domain_name(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_domain.name)
         ):
             management.call_command("stop-abuse", self.my_domain)
@@ -55,7 +55,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         self.assertFalse(block_exists("127.0.0.1"))
 
     def test_remove_rrsets_by_email(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             *[self.requests_desec_rr_sets_update(name=d.name) for d in self.my_domains],
             expect_order=False,
         ):
@@ -77,7 +77,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         self.assertFalse(block_exists("127.0.0.1"))
 
     def test_disable_user_by_domain_name(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_domain.name)
         ):
             management.call_command("stop-abuse", self.my_domain)
@@ -85,7 +85,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         self.assertEqual(self.owner.is_active, False)
 
     def test_disable_user_by_email(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             *[self.requests_desec_rr_sets_update(name=d.name) for d in self.my_domains],
             expect_order=False,
         ):
@@ -94,7 +94,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         self.assertEqual(self.owner.is_active, False)
 
     def test_keep_other_owned_domains_name(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_domain.name)
         ):
             management.call_command("stop-abuse", self.my_domain)
@@ -103,7 +103,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         )
 
     def test_dont_keep_other_owned_domains_email(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             *[self.requests_desec_rr_sets_update(name=d.name) for d in self.my_domains],
             expect_order=False,
         ):
@@ -113,7 +113,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         )
 
     def test_only_disable_owner(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_domains[0].name),
             self.requests_desec_rr_sets_update(name=self.my_domains[1].name),
             expect_order=False,
@@ -125,7 +125,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         self.assertEqual(self.other_domain.owner.is_active, True)
 
     def test_disable_owners_by_domain_name(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             self.requests_desec_rr_sets_update(name=self.my_domain.name),
             self.requests_desec_rr_sets_update(name=self.other_domain.name),
             expect_order=False,
@@ -137,7 +137,7 @@ class StopAbuseCommandTest(DomainOwnerTestCase):
         self.assertEqual(self.other_domain.owner.is_active, False)
 
     def test_disable_owners_by_email(self):
-        with self.assertPdnsRequests(
+        with self.assertRequests(
             *[
                 self.requests_desec_rr_sets_update(name=d.name)
                 for d in self.my_domains + self.other_domains

api/desecapi/tests/test_token_domain_policy.py

@@ -303,7 +303,7 @@ class TokenDomainPolicyTestCase(DomainOwnerTestCase):
             responses = []
             if value:
                 pdns_name = self._normalize_name(name).lower()
-                cm = self.assertPdnsNoRequestsBut(
+                cm = self.assertNoRequestsBut(
                     self.request_pdns_zone_update(name=pdns_name),
                     self.request_pdns_zone_axfr(name=pdns_name),
                 )

api/desecapi/tests/test_user_management.py

@@ -485,7 +485,7 @@ class UserManagementTestCase(DesecTestCase, PublicSuffixMockMixin):
             cm = self.requests_desec_domain_creation_auto_delegation(domain)
         else:
             cm = self.requests_desec_domain_creation(domain)
-        with self.assertPdnsRequests(cm):
+        with self.assertRequests(cm):
             response = self.client.verify(confirmation_link)
         self.assertRegistrationWithDomainVerificationSuccessResponse(
             response, domain, email
@@ -1323,7 +1323,7 @@ class RenewTestCase(UserManagementTestCase, DomainOwnerTestCase):
             domain.save()
             domain.rrset_set.update(touched=domain.published)
 
-            with self.assertPdnsRequests(
+            with self.assertRequests(
                 self.requests_desec_domain_deletion(domain=domain)
             ):
                 call_command("scavenge-unused")