diff --git a/src/postorius/tests/__init__.py b/src/postorius/tests/__init__.py index b3bd492..8dd6a23 100644 --- a/src/postorius/tests/__init__.py +++ b/src/postorius/tests/__init__.py @@ -34,3 +34,8 @@ MM_VCR = vcr.VCR( cassette_library_dir=os.path.join(FIXTURES_DIR, 'vcr_cassettes'), record_mode=VCR_RECORD_MODE) + + +API_CREDENTIALS = {'MAILMAN_REST_API_URL': 'http://localhost:9001', + 'MAILMAN_REST_API_USER': 'restadmin', + 'MAILMAN_REST_API_PASS': 'restpass'} diff --git a/src/postorius/tests/mailman_api_tests/__init__.py b/src/postorius/tests/mailman_api_tests/__init__.py index da86cfa..91eab69 100644 --- a/src/postorius/tests/mailman_api_tests/__init__.py +++ b/src/postorius/tests/mailman_api_tests/__init__.py @@ -22,10 +22,5 @@ from urllib2 import HTTPError -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS from postorius.utils import get_client - - -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} diff --git a/src/postorius/tests/mailman_api_tests/test_list_index.py b/src/postorius/tests/mailman_api_tests/test_list_index.py index a55347a..ace9485 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_index.py +++ b/src/postorius/tests/mailman_api_tests/test_list_index.py @@ -26,7 +26,7 @@ from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS logger = logging.getLogger(__name__) @@ -34,11 +34,6 @@ vcr_log.setLevel(logging.WARNING) -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - - @override_settings(**API_CREDENTIALS) class ListIndexPageTest(SimpleTestCase): """Tests for the list index page.""" diff --git a/src/postorius/tests/mailman_api_tests/test_list_members.py b/src/postorius/tests/mailman_api_tests/test_list_members.py index cd90f8d..f09989c 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_members.py +++ b/src/postorius/tests/mailman_api_tests/test_list_members.py @@ -25,7 +25,7 @@ except ImportError: from urllib.error import HTTPError -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS from postorius.utils import get_client @@ -34,11 +34,6 @@ vcr_log.setLevel(logging.WARNING) -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - - @override_settings(**API_CREDENTIALS) class ListMembersAccessTest(TestCase): """Tests for the list members page. diff --git a/src/postorius/tests/mailman_api_tests/test_list_metrics.py b/src/postorius/tests/mailman_api_tests/test_list_metrics.py index 7ad0c98..c2865cf 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_metrics.py +++ b/src/postorius/tests/mailman_api_tests/test_list_metrics.py @@ -13,7 +13,7 @@ from six.moves.urllib_error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS logger = logging.getLogger(__name__) @@ -21,12 +21,8 @@ vcr_log.setLevel(logging.WARNING) -TEST_API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - -@override_settings(**TEST_API_CREDENTIALS) +@override_settings(**API_CREDENTIALS) class TestListMetrics(SimpleTestCase): @MM_VCR.use_cassette('test_list_metrics.yaml') diff --git a/src/postorius/tests/mailman_api_tests/test_list_new.py b/src/postorius/tests/mailman_api_tests/test_list_new.py index 2824b78..68090a7 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_new.py +++ b/src/postorius/tests/mailman_api_tests/test_list_new.py @@ -27,7 +27,7 @@ from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS logger = logging.getLogger(__name__) @@ -35,11 +35,6 @@ vcr_log.setLevel(logging.WARNING) -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - - @override_settings(**API_CREDENTIALS) class ListCreationTest(SimpleTestCase): """Tests for the new list page.""" diff --git a/src/postorius/tests/mailman_api_tests/test_list_summary.py b/src/postorius/tests/mailman_api_tests/test_list_summary.py index acb50d7..26f86a5 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_summary.py +++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py @@ -27,7 +27,7 @@ from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS logger = logging.getLogger(__name__) @@ -35,11 +35,6 @@ vcr_log.setLevel(logging.WARNING) -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - - @override_settings(**API_CREDENTIALS) class ListSummaryPageTest(SimpleTestCase): """Tests for the list summary page. diff --git a/src/postorius/tests/mailman_api_tests/test_models.py b/src/postorius/tests/mailman_api_tests/test_models.py index 655ea42..f38d6bc 100644 --- a/src/postorius/tests/mailman_api_tests/test_models.py +++ b/src/postorius/tests/mailman_api_tests/test_models.py @@ -27,7 +27,7 @@ from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS logger = logging.getLogger(__name__) @@ -35,11 +35,6 @@ vcr_log.setLevel(logging.WARNING) -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - - @override_settings(**API_CREDENTIALS) class ModelTest(SimpleTestCase): """Tests for the list index page.""" diff --git a/src/postorius/tests/mailman_api_tests/test_subscriptions.py b/src/postorius/tests/mailman_api_tests/test_subscriptions.py index 6bdd987..99173d1 100644 --- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py +++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py @@ -25,7 +25,7 @@ except ImportError: from urllib.error import HTTPError -from postorius.tests import MM_VCR +from postorius.tests import MM_VCR, API_CREDENTIALS from postorius.utils import get_client @@ -34,11 +34,6 @@ vcr_log.setLevel(logging.WARNING) -API_CREDENTIALS = {'MAILMAN_API_URL': 'http://localhost:9001', - 'MAILMAN_USER': 'restadmin', - 'MAILMAN_PASS': 'restpass'} - - @override_settings(**API_CREDENTIALS) class TestSubscriptionPolicyOpen(TestCase): """Tests for the list members page. diff --git a/testing/test_settings.py b/testing/test_settings.py index 155f454..5ca0be5 100755 --- a/testing/test_settings.py +++ b/testing/test_settings.py @@ -24,9 +24,9 @@ import os.path # Mailman API credentials for testing -MAILMAN_API_URL = 'http://localhost:9001' -MAILMAN_USER = 'restadmin' -MAILMAN_PASS = 'restpass' +MAILMAN_REST_API_URL = 'http://localhost:9001' +MAILMAN_REST_API_USER = 'restadmin' +MAILMAN_REST_API_PASS = 'restpass' PROJECT_PATH = os.path.abspath(os.path.dirname(__file__))