Cleanup

The `unit/apikey` directory is removed because it does not contain any
tests. Same for `unit/test_decorators.py`.
The `fixture` module is renamed to the special-name `conftest` [0] so
they are available in all tests without the need to import them. With
that in place, I removed all now unneeded or previously already unused
imports from the tests.
Also removed that wierd `sys.path` bit from `unit/zone/test_admin_apikey.py`,
no idea what that was originally intended for.

[0] https://docs.pytest.org/en/6.2.x/fixture.html#conftest-py-sharing-fixtures-across-multiple-files

tests/integration/api/apikey/test_admin_user.py

@@ -4,8 +4,7 @@ from collections import namedtuple
 
 from powerdnsadmin.lib.validators import validate_apikey
 from powerdnsadmin.lib.schema import ApiKeySchema
-from tests.fixtures import client, initial_data, basic_auth_admin_headers
+from tests.conftest import user_apikey_data, admin_apikey_data
-from tests.fixtures import user_apikey_data, admin_apikey_data, zone_data
 
 
 class TestIntegrationApiApiKeyAdminUser(object):

tests/integration/api/apikey/test_user.py

@@ -1,11 +1,8 @@
-import pytest
 import json
 from collections import namedtuple
 
 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):

tests/integration/api/management/test_admin_user.py

@@ -1,9 +1,5 @@
-
 import json
-from tests.fixtures import (    # noqa: F401
+
-    client, initial_data, basic_auth_admin_headers,
-    test_admin_user, test_user, account_data, user1_data,
-)
 from . import IntegrationApiManagement
 
 

tests/integration/api/management/test_user.py

@@ -1,10 +1,6 @@
 
 import json
 
-from tests.fixtures import (    # noqa: F401
-    client, initial_data, basic_auth_admin_headers, basic_auth_user_headers,
-    test_admin_user, test_user, account_data, user1_data,
-)
 from . import IntegrationApiManagement
 
 

tests/integration/api/zone/test_admin_user.py

@@ -1,11 +1,8 @@
-import pytest
 import json
 from collections import namedtuple
 
 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):

tests/integration/api/zone/test_apikey_admin_user.py

@@ -3,9 +3,6 @@ from collections import namedtuple
 
 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):

tests/integration/api/zone/test_apikey_user.py

@@ -3,9 +3,6 @@ from collections import namedtuple
 
 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
 
 class TestIntegrationApiZoneUserApiKey(object):
 

tests/integration/api/zone/test_user.py

@@ -3,8 +3,6 @@ from collections import namedtuple
 
 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):

tests/unit/zone/test_admin_apikey.py

@@ -2,9 +2,6 @@ import json
 import pytest
 from unittest.mock import patch
 from collections import namedtuple
-import sys
-import os
-sys.path.append(os.getcwd())
 
 import powerdnsadmin
 from powerdnsadmin.models.setting import Setting
@@ -12,10 +9,8 @@ from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.models.api_key import ApiKey
 from powerdnsadmin.models.role import Role
 from powerdnsadmin.lib.validators import validate_zone
-from powerdnsadmin.lib.schema import DomainSchema, ApiKeySchema
+from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, initial_data, created_zone_data
+from tests.conftest import admin_apikey_data, load_data
-from tests.fixtures import user_apikey, admin_apikey, zone_data
-from tests.fixtures import admin_apikey_data, load_data
 
 
 class TestUnitApiZoneAdminApiKey(object):

tests/unit/zone/test_admin_user.py

@@ -5,12 +5,10 @@ from collections import namedtuple
 
 import powerdnsadmin
 from powerdnsadmin.models.user import User
-from powerdnsadmin.models.role import Role
 from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, basic_auth_admin_headers
+from tests.conftest import load_data
-from tests.fixtures import zone_data, created_zone_data, load_data
 
 
 class TestUnitApiZoneAdminUser(object):

tests/unit/zone/test_user.py

@@ -5,12 +5,10 @@ from collections import namedtuple
 
 import powerdnsadmin
 from powerdnsadmin.models.user import User
-from powerdnsadmin.models.role import Role
 from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.lib.validators import validate_zone
 from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, basic_auth_user_headers
+from tests.conftest import load_data
-from tests.fixtures import zone_data, created_zone_data, load_data
 
 
 class TestUnitApiZoneUser(object):

tests/unit/zone/test_user_apikey.py

@@ -1,7 +1,6 @@
 import json
 import pytest
 from unittest.mock import patch
-from base64 import b64encode
 from collections import namedtuple
 
 import powerdnsadmin
@@ -10,10 +9,8 @@ from powerdnsadmin.models.domain import Domain
 from powerdnsadmin.models.api_key import ApiKey
 from powerdnsadmin.models.role import Role
 from powerdnsadmin.lib.validators import validate_zone
-from powerdnsadmin.lib.schema import DomainSchema, ApiKeySchema
+from powerdnsadmin.lib.schema import DomainSchema
-from tests.fixtures import client, initial_data, created_zone_data
+from tests.conftest import user_apikey_data, load_data
-from tests.fixtures import user_apikey, zone_data
-from tests.fixtures import user_apikey_data, load_data
 
 
 class TestUnitApiZoneUserApiKey(object):