Fix the tests

Fix the tests

Fix the tests

tests/integration/api/zone/test_admin_user.py

@@ -1,43 +1,27 @@
-import os
 import pytest
-import sys
 import json
-from base64 import b64encode
 from collections import namedtuple
-import logging as logger
-sys.path.append(os.getcwd())
-import app
-from app.validators import validate_zone
-from app.models import Setting
-from app.schema import DomainSchema
+
+from powerdnsadmin.lib.validators import validate_zone
+from powerdnsadmin.lib.schema import DomainSchema
 from tests.fixtures import client, initial_data, basic_auth_admin_headers
 from tests.fixtures import zone_data
 
 
 class TestIntegrationApiZoneAdminUser(object):
-
     def test_empty_get(self, client, initial_data, basic_auth_admin_headers):
-        res = client.get(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_admin_headers
-        )
+        res = client.get("/api/v1/pdnsadmin/zones",
+                         headers=basic_auth_admin_headers)
         data = res.get_json(force=True)
         assert res.status_code == 200
         assert data == []
 
-    def test_create_zone(
-        self,
-        client,
-        initial_data,
-        zone_data,
-        basic_auth_admin_headers
-    ):
-        res = client.post(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_admin_headers,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_create_zone(self, client, initial_data, zone_data,
+                         basic_auth_admin_headers):
+        res = client.post("/api/v1/pdnsadmin/zones",
+                          headers=basic_auth_admin_headers,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
@@ -46,36 +30,24 @@ class TestIntegrationApiZoneAdminUser(object):
 
         zone_url_format = "/api/v1/pdnsadmin/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=basic_auth_admin_headers
-        )
+        res = client.delete(zone_url, headers=basic_auth_admin_headers)
 
         assert res.status_code == 204
 
-    def test_get_multiple_zones(
-        self,
-        client,
-        initial_data,
-        zone_data,
-        basic_auth_admin_headers
-    ):
-        res = client.post(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_admin_headers,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_get_multiple_zones(self, client, initial_data, zone_data,
+                                basic_auth_admin_headers):
+        res = client.post("/api/v1/pdnsadmin/zones",
+                          headers=basic_auth_admin_headers,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
         validate_zone(data)
         assert res.status_code == 201
 
-        res = client.get(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_admin_headers
-        )
+        res = client.get("/api/v1/pdnsadmin/zones",
+                         headers=basic_auth_admin_headers)
         data = res.get_json(force=True)
         fake_domain = namedtuple("Domain", data[0].keys())(*data[0].values())
         domain_schema = DomainSchema(many=True)
@@ -85,26 +57,16 @@ class TestIntegrationApiZoneAdminUser(object):
 
         zone_url_format = "/api/v1/pdnsadmin/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=basic_auth_admin_headers
-        )
+        res = client.delete(zone_url, headers=basic_auth_admin_headers)
 
         assert res.status_code == 204
 
-    def test_delete_zone(
-        self,
-        client,
-        initial_data,
-        zone_data,
-        basic_auth_admin_headers
-    ):
-        res = client.post(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_admin_headers,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_delete_zone(self, client, initial_data, zone_data,
+                         basic_auth_admin_headers):
+        res = client.post("/api/v1/pdnsadmin/zones",
+                          headers=basic_auth_admin_headers,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
@@ -113,9 +75,6 @@ class TestIntegrationApiZoneAdminUser(object):
 
         zone_url_format = "/api/v1/pdnsadmin/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=basic_auth_admin_headers
-        )
+        res = client.delete(zone_url, headers=basic_auth_admin_headers)
 
         assert res.status_code == 204

tests/integration/api/zone/test_apikey_admin_user.py

@@ -1,44 +1,28 @@
-import os
-import pytest
-import sys
 import json
-from base64 import b64encode
 from collections import namedtuple
-import logging as logger
-sys.path.append(os.getcwd())
-import app
-from app.validators import validate_zone
-from app.models import Setting
-from app.schema import DomainSchema
+
+from powerdnsadmin.lib.validators import validate_zone
+from powerdnsadmin.lib.schema import DomainSchema
 from tests.fixtures import client
 from tests.fixtures import zone_data, initial_apikey_data
 from tests.fixtures import admin_apikey_integration
 
 
 class TestIntegrationApiZoneAdminApiKey(object):
-
-    def test_empty_get(self, client, initial_apikey_data, admin_apikey_integration):
-        res = client.get(
-            "/api/v1/servers/localhost/zones",
-            headers=admin_apikey_integration
-        )
+    def test_empty_get(self, client, initial_apikey_data,
+                       admin_apikey_integration):
+        res = client.get("/api/v1/servers/localhost/zones",
+                         headers=admin_apikey_integration)
         data = res.get_json(force=True)
         assert res.status_code == 200
         assert data == []
 
-    def test_create_zone(
-        self,
-        client,
-        initial_apikey_data,
-        zone_data,
-        admin_apikey_integration
-    ):
-        res = client.post(
-            "/api/v1/servers/localhost/zones",
-            headers=admin_apikey_integration,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_create_zone(self, client, initial_apikey_data, zone_data,
+                         admin_apikey_integration):
+        res = client.post("/api/v1/servers/localhost/zones",
+                          headers=admin_apikey_integration,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
@@ -47,36 +31,24 @@ class TestIntegrationApiZoneAdminApiKey(object):
 
         zone_url_format = "/api/v1/servers/localhost/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=admin_apikey_integration
-        )
+        res = client.delete(zone_url, headers=admin_apikey_integration)
 
         assert res.status_code == 204
 
-    def test_get_multiple_zones(
-        self,
-        client,
-        initial_apikey_data,
-        zone_data,
-        admin_apikey_integration
-    ):
-        res = client.post(
-            "/api/v1/servers/localhost/zones",
-            headers=admin_apikey_integration,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_get_multiple_zones(self, client, initial_apikey_data, zone_data,
+                                admin_apikey_integration):
+        res = client.post("/api/v1/servers/localhost/zones",
+                          headers=admin_apikey_integration,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
         validate_zone(data)
         assert res.status_code == 201
 
-        res = client.get(
-            "/api/v1/servers/localhost/zones",
-            headers=admin_apikey_integration
-        )
+        res = client.get("/api/v1/servers/localhost/zones",
+                         headers=admin_apikey_integration)
         data = res.get_json(force=True)
         fake_domain = namedtuple("Domain", data[0].keys())(*data[0].values())
         domain_schema = DomainSchema(many=True)
@@ -86,26 +58,16 @@ class TestIntegrationApiZoneAdminApiKey(object):
 
         zone_url_format = "/api/v1/servers/localhost/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=admin_apikey_integration
-        )
+        res = client.delete(zone_url, headers=admin_apikey_integration)
 
         assert res.status_code == 204
 
-    def test_delete_zone(
-        self,
-        client,
-        initial_apikey_data,
-        zone_data,
-        admin_apikey_integration
-    ):
-        res = client.post(
-            "/api/v1/servers/localhost/zones",
-            headers=admin_apikey_integration,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_delete_zone(self, client, initial_apikey_data, zone_data,
+                         admin_apikey_integration):
+        res = client.post("/api/v1/servers/localhost/zones",
+                          headers=admin_apikey_integration,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
@@ -114,9 +76,6 @@ class TestIntegrationApiZoneAdminApiKey(object):
 
         zone_url_format = "/api/v1/servers/localhost/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=admin_apikey_integration
-        )
+        res = client.delete(zone_url, headers=admin_apikey_integration)
 
         assert res.status_code == 204

tests/integration/api/zone/test_apikey_user.py

@@ -1,14 +1,8 @@
-import os
-import pytest
-import sys
 import json
-from base64 import b64encode
 from collections import namedtuple
-sys.path.append(os.getcwd())
-import app
-from app.validators import validate_zone
-from app.models import Setting
-from app.schema import DomainSchema
+
+from powerdnsadmin.lib.validators import validate_zone
+from powerdnsadmin.lib.schema import DomainSchema
 from tests.fixtures import client
 from tests.fixtures import zone_data, initial_apikey_data
 from tests.fixtures import user_apikey_integration

tests/integration/api/zone/test_user.py

@@ -1,42 +1,26 @@
-import os
-import pytest
-import sys
 import json
-from base64 import b64encode
 from collections import namedtuple
-sys.path.append(os.getcwd())
-import app
-from app.validators import validate_zone
-from app.models import Setting
-from app.schema import DomainSchema
+
+from powerdnsadmin.lib.validators import validate_zone
+from powerdnsadmin.lib.schema import DomainSchema
 from tests.fixtures import client, initial_data, basic_auth_user_headers
 from tests.fixtures import zone_data
 
 
 class TestIntegrationApiZoneUser(object):
-
     def test_empty_get(self, initial_data, client, basic_auth_user_headers):
-        res = client.get(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_user_headers
-        )
+        res = client.get("/api/v1/pdnsadmin/zones",
+                         headers=basic_auth_user_headers)
         data = res.get_json(force=True)
         assert res.status_code == 200
         assert data == []
 
-    def test_create_zone(
-        self,
-        initial_data,
-        client,
-        zone_data,
-        basic_auth_user_headers
-    ):
-        res = client.post(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_user_headers,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_create_zone(self, initial_data, client, zone_data,
+                         basic_auth_user_headers):
+        res = client.post("/api/v1/pdnsadmin/zones",
+                          headers=basic_auth_user_headers,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
@@ -45,36 +29,24 @@ class TestIntegrationApiZoneUser(object):
 
         zone_url_format = "/api/v1/pdnsadmin/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=basic_auth_user_headers
-        )
+        res = client.delete(zone_url, headers=basic_auth_user_headers)
 
         assert res.status_code == 204
 
-    def test_get_multiple_zones(
-        self,
-        initial_data,
-        client,
-        zone_data,
-        basic_auth_user_headers
-    ):
-        res = client.post(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_user_headers,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_get_multiple_zones(self, initial_data, client, zone_data,
+                                basic_auth_user_headers):
+        res = client.post("/api/v1/pdnsadmin/zones",
+                          headers=basic_auth_user_headers,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
         validate_zone(data)
         assert res.status_code == 201
 
-        res = client.get(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_user_headers
-        )
+        res = client.get("/api/v1/pdnsadmin/zones",
+                         headers=basic_auth_user_headers)
         data = res.get_json(force=True)
         fake_domain = namedtuple("Domain", data[0].keys())(*data[0].values())
         domain_schema = DomainSchema(many=True)
@@ -84,26 +56,16 @@ class TestIntegrationApiZoneUser(object):
 
         zone_url_format = "/api/v1/pdnsadmin/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=basic_auth_user_headers
-        )
+        res = client.delete(zone_url, headers=basic_auth_user_headers)
 
         assert res.status_code == 204
 
-    def test_delete_zone(
-        self,
-        initial_data,
-        client,
-        zone_data,
-        basic_auth_user_headers
-    ):
-        res = client.post(
-            "/api/v1/pdnsadmin/zones",
-            headers=basic_auth_user_headers,
-            data=json.dumps(zone_data),
-            content_type="application/json"
-        )
+    def test_delete_zone(self, initial_data, client, zone_data,
+                         basic_auth_user_headers):
+        res = client.post("/api/v1/pdnsadmin/zones",
+                          headers=basic_auth_user_headers,
+                          data=json.dumps(zone_data),
+                          content_type="application/json")
         data = res.get_json(force=True)
         data['rrsets'] = []
 
@@ -112,9 +74,6 @@ class TestIntegrationApiZoneUser(object):
 
         zone_url_format = "/api/v1/pdnsadmin/zones/{0}"
         zone_url = zone_url_format.format(zone_data['name'].rstrip("."))
-        res = client.delete(
-            zone_url,
-            headers=basic_auth_user_headers
-        )
+        res = client.delete(zone_url, headers=basic_auth_user_headers)
 
         assert res.status_code == 204