Browse Source

style(api): name variants of domain creation request expectations

Nils Wisiol 3 years ago
parent
commit
ea29938972
2 changed files with 9 additions and 6 deletions
  1. 7 4
      api/desecapi/tests/base.py
  2. 2 2
      api/desecapi/tests/test_domains.py

+ 7 - 4
api/desecapi/tests/base.py

@@ -782,15 +782,18 @@ class DesecTestCase(MockPDNSTestCase):
         return parents[0]
         return parents[0]
 
 
     @classmethod
     @classmethod
-    def requests_desec_domain_creation(cls, name=None):
+    def requests_desec_domain_creation(cls, name=None, axfr=True, keys=True):
         soa_content = 'get.desec.io. get.desec.io. 1 86400 3600 2419200 3600'
         soa_content = 'get.desec.io. get.desec.io. 1 86400 3600 2419200 3600'
-        return [
+        requests = [
             cls.request_pdns_zone_create(ns='LORD', payload=soa_content),
             cls.request_pdns_zone_create(ns='LORD', payload=soa_content),
             cls.request_pdns_zone_create(ns='MASTER'),
             cls.request_pdns_zone_create(ns='MASTER'),
             cls.request_pdns_update_catalog(),
             cls.request_pdns_update_catalog(),
-            cls.request_pdns_zone_axfr(name=name),
-            cls.request_pdns_zone_retrieve_crypto_keys(name=name),
         ]
         ]
+        if axfr:
+            requests.append(cls.request_pdns_zone_axfr(name=name))
+        if keys:
+            requests.append(cls.request_pdns_zone_retrieve_crypto_keys(name=name))
+        return requests
 
 
     @classmethod
     @classmethod
     def requests_desec_domain_deletion(cls, domain):
     def requests_desec_domain_deletion(cls, domain):

+ 2 - 2
api/desecapi/tests/test_domains.py

@@ -192,7 +192,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
             'max.length.x01234567890123456789012345678901234567890123456789012345678901.com',
             'max.length.x01234567890123456789012345678901234567890123456789012345678901.com',
         ]:
         ]:
             with self.assertPdnsRequests(
             with self.assertPdnsRequests(
-                self.requests_desec_domain_creation(name=name)[:-1]  # no serializer, no cryptokeys API call
+                self.requests_desec_domain_creation(name=name, keys=False)  # no serializer, no cryptokeys API call
             ), PDNSChangeTracker():
             ), PDNSChangeTracker():
                 Domain(owner=self.owner, name=name).save()
                 Domain(owner=self.owner, name=name).save()
 
 
@@ -333,7 +333,7 @@ class DomainOwnerTestCase1(DomainOwnerTestCase):
 
 
     def test_create_domain_under_public_suffix_with_private_parent(self):
     def test_create_domain_under_public_suffix_with_private_parent(self):
         name = 'amazonaws.com'
         name = 'amazonaws.com'
-        with self.assertPdnsRequests(self.requests_desec_domain_creation(name)[:-1]), PDNSChangeTracker():
+        with self.assertPdnsRequests(self.requests_desec_domain_creation(name, keys=False)), PDNSChangeTracker():
             Domain(owner=self.create_user(), name=name).save()
             Domain(owner=self.create_user(), name=name).save()
             self.assertTrue(Domain.objects.filter(name=name).exists())
             self.assertTrue(Domain.objects.filter(name=name).exists())