diff --git a/tests/feature_server_extension_mixin.py b/tests/feature_server_extension_mixin.py index 35c6b94..9e2d520 100644 --- a/tests/feature_server_extension_mixin.py +++ b/tests/feature_server_extension_mixin.py @@ -16,6 +16,9 @@ # Local imports from .helpers import TRUEISH_TEST_PARAMS +# import additional fixtures +from .extension_base import * + @pytest.mark.parametrize( ('attribute', 'expected_value', 'exception'), diff --git a/tests/jpip_server_extension_mixin.py b/tests/jpip_server_extension_mixin.py index 3a7a57d..908bf36 100644 --- a/tests/jpip_server_extension_mixin.py +++ b/tests/jpip_server_extension_mixin.py @@ -13,6 +13,9 @@ # Third-party imports import pytest +# import additional fixtures +from .extension_base import * + @pytest.mark.parametrize( ('attribute', 'expected_value', 'exception'), diff --git a/tests/kml_server_extension_mixin.py b/tests/kml_server_extension_mixin.py index fb57015..925d24c 100644 --- a/tests/kml_server_extension_mixin.py +++ b/tests/kml_server_extension_mixin.py @@ -16,6 +16,9 @@ # Local imports from agsconfig.services.kml_server_extension import KmlServerExtension as kml +# import additional fixtures +from .extension_base import * + @pytest.mark.parametrize( ('attribute', 'expectedValue', 'exception'), diff --git a/tests/na_server_extension_mixin.py b/tests/na_server_extension_mixin.py index c6728f4..7c8d4b8 100644 --- a/tests/na_server_extension_mixin.py +++ b/tests/na_server_extension_mixin.py @@ -16,8 +16,5 @@ # Fixture imports from .helpers import TRUEISH_TEST_PARAMS - -@pytest.mark.parametrize(("enabled", "expected"), TRUEISH_TEST_PARAMS) -def test_na_enabled(service_config, enabled, expected): - service_config.na_server.enabled = enabled - assert service_config.na_server.enabled == expected +# import additional fixtures +from .extension_base import * diff --git a/tests/wcs_server_extension_mixin.py b/tests/wcs_server_extension_mixin.py index 0aefb66..688e814 100644 --- a/tests/wcs_server_extension_mixin.py +++ b/tests/wcs_server_extension_mixin.py @@ -13,6 +13,7 @@ import pytest from .custom_get_capabilities_mixin import * +from .extension_base import * from .ogc_metadata_extension_mixin import * diff --git a/tests/wfs_server_extension_mixin.py b/tests/wfs_server_extension_mixin.py index a18ea0b..8446c28 100644 --- a/tests/wfs_server_extension_mixin.py +++ b/tests/wfs_server_extension_mixin.py @@ -21,6 +21,7 @@ # Addition test fixtures to mix in from .custom_get_capabilities_mixin import * +from .extension_base import * from .ogc_metadata_extension_mixin import * diff --git a/tests/wms_server_extension_mixin.py b/tests/wms_server_extension_mixin.py index fff732f..5c8b0f0 100644 --- a/tests/wms_server_extension_mixin.py +++ b/tests/wms_server_extension_mixin.py @@ -16,6 +16,7 @@ from agsconfig.services.wms_server_extension import WMSServerExtension as wms from .custom_get_capabilities_mixin import * +from .extension_base import * from .ogc_metadata_extension_mixin import * diff --git a/tests/wps_server_extension_mixin.py b/tests/wps_server_extension_mixin.py index 2837f2d..2550438 100644 --- a/tests/wps_server_extension_mixin.py +++ b/tests/wps_server_extension_mixin.py @@ -12,6 +12,7 @@ from agsconfig.services.wps_server_extension import WPSServerExtension as wps from .custom_get_capabilities_mixin import * +from .extension_base import * from .ogc_metadata_extension_mixin import * @@ -27,13 +28,12 @@ def service_extension(service_config): ('britney_spears', 'should cause an', AttributeError), # because she isn't a member ('app_schema_prefix', 'TestProject_TestService', None), ('contact_instructions', None, None), - ('enabled', False, None), ('hours_of_service', None, None), ('name', 'WPS', None), ('provider_site', None, None), ('role', None, None), - ('service_type', None, None), - ('service_type_version', None, None) + ('service_type_version', None, None), + ('service_type', None, None) ] ) def test_wps_getters(service_extension, attribute, expected_value, exception): @@ -50,14 +50,12 @@ def test_wps_getters(service_extension, attribute, expected_value, exception): ('britney_spears', 'should cause a', None, TypeError), # because she isn't a member ('app_schema_prefix', 'prefix', 'prefix', None), ('contact_instructions', 'instructions', 'instructions', None), - ('enabled', True, True, None), - ('enabled', 'x', None, ValueError), ('hours_of_service', 'hours', 'hours', None), ('name', 'name', 'name', None), ('provider_site', 'site', 'site', None), ('role', 'role', 'role', None), - ('service_type', 'type', 'type', None), - ('service_type_version', 'version', 'version', None) + ('service_type_version', 'version', 'version', None), + ('service_type', 'type', 'type', None) ] ) def test_wps_setters(service_extension, attribute, new_value, expected_value, exception):