diff --git a/src/postorius/tests/__init__.py b/src/postorius/tests/__init__.py index c13bb37..564ce3b 100644 --- a/src/postorius/tests/__init__.py +++ b/src/postorius/tests/__init__.py @@ -43,8 +43,3 @@ filter_headers=['authorization', 'user-agent', 'date'], before_record_response=filter_response_headers, ) - - -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 91eab69..8b13789 100644 --- a/src/postorius/tests/mailman_api_tests/__init__.py +++ b/src/postorius/tests/mailman_api_tests/__init__.py @@ -1,26 +1 @@ -# -*- coding: utf-8 -*- -# Copyright (C) 2012-2015 by the Free Software Foundation, Inc. -# -# This file is part of Postorius. -# -# Postorius is free software: you can redistribute it and/or modify it under -# the terms of the GNU General Public License as published by the Free -# Software Foundation, either version 3 of the License, or (at your option) -# any later version. -# Postorius is distributed in the hope that it will be useful, but WITHOUT -# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -# more details. -# -# You should have received a copy of the GNU General Public License along with -# Postorius. If not, see . -from __future__ import ( - absolute_import, division, print_function, unicode_literals) -__metaclass__ = type - - -from urllib2 import HTTPError - -from postorius.tests import MM_VCR, API_CREDENTIALS -from postorius.utils import get_client diff --git a/src/postorius/tests/mailman_api_tests/test_archival_options.py b/src/postorius/tests/mailman_api_tests/test_archival_options.py index 199b93a..386219d 100644 --- a/src/postorius/tests/mailman_api_tests/test_archival_options.py +++ b/src/postorius/tests/mailman_api_tests/test_archival_options.py @@ -29,7 +29,6 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.test import Client, RequestFactory, TestCase -from django.test.utils import override_settings try: from urllib2 import HTTPError except ImportError: @@ -37,7 +36,6 @@ from postorius.forms import ListArchiverForm from postorius.tests import MM_VCR -from postorius.tests.mailman_api_tests import API_CREDENTIALS from postorius.utils import get_client from postorius.views.list import _add_archival_messages @@ -47,7 +45,6 @@ vcr_log.setLevel(logging.WARNING) -@override_settings(**API_CREDENTIALS) class ArchivalOptionsAccessTest(TestCase): @MM_VCR.use_cassette('archival_options.yaml') @@ -84,7 +81,6 @@ self.assertEqual(response.status_code, 200) -@override_settings(**API_CREDENTIALS) class ArchivalOptions(TestCase): @MM_VCR.use_cassette('test_list_archival_options.yaml') 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 340b640..41f1eea 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_index.py +++ b/src/postorius/tests/mailman_api_tests/test_list_index.py @@ -19,14 +19,13 @@ from django.core.urlresolvers import reverse from django.test import Client, SimpleTestCase -from django.test.utils import override_settings try: from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR, API_CREDENTIALS +from postorius.tests import MM_VCR logger = logging.getLogger(__name__) @@ -34,7 +33,6 @@ vcr_log.setLevel(logging.WARNING) -@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 bb1351d..ad8817b 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_members.py +++ b/src/postorius/tests/mailman_api_tests/test_list_members.py @@ -22,12 +22,11 @@ from django.core.urlresolvers import reverse from django.utils.timezone import now from django.test import Client, TestCase -from django.test.utils import override_settings from six.moves.urllib_error import HTTPError from six.moves.urllib_parse import quote from postorius.models import MailmanUser, Mailman404Error -from postorius.tests import MM_VCR, API_CREDENTIALS +from postorius.tests import MM_VCR from postorius.tests.utils import get_flash_messages from postorius.utils import get_client @@ -37,7 +36,6 @@ vcr_log.setLevel(logging.WARNING) -@override_settings(**API_CREDENTIALS) class ListMembersAccessTest(TestCase): """Tests for the list members page. @@ -113,7 +111,6 @@ self.assertEqual(response.status_code, 200) -@override_settings(**API_CREDENTIALS) class AddRemoveOwnerTest(TestCase): """Tests for the list members page. @@ -200,7 +197,6 @@ -@override_settings(**API_CREDENTIALS) class AddModeratorTest(TestCase): """Tests for the list members page. 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 3549c65..63a9bda 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_new.py +++ b/src/postorius/tests/mailman_api_tests/test_list_new.py @@ -22,14 +22,14 @@ from django.core.urlresolvers import reverse from django.shortcuts import resolve_url from django.test import Client, SimpleTestCase -from django.test.utils import override_settings + try: from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR, API_CREDENTIALS +from postorius.tests import MM_VCR logger = logging.getLogger(__name__) @@ -37,7 +37,6 @@ vcr_log.setLevel(logging.WARNING) -@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 133de69..b661688 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_summary.py +++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py @@ -20,14 +20,13 @@ from django.core.urlresolvers import reverse from django.db import IntegrityError from django.test import Client, SimpleTestCase -from django.test.utils import override_settings try: from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR, API_CREDENTIALS +from postorius.tests import MM_VCR logger = logging.getLogger(__name__) @@ -35,7 +34,6 @@ vcr_log.setLevel(logging.WARNING) -@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 5285462..163e757 100644 --- a/src/postorius/tests/mailman_api_tests/test_models.py +++ b/src/postorius/tests/mailman_api_tests/test_models.py @@ -20,14 +20,13 @@ from django.core.urlresolvers import reverse from django.db import IntegrityError from django.test import Client, SimpleTestCase -from django.test.utils import override_settings try: from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError from postorius.utils import get_client -from postorius.tests import MM_VCR, API_CREDENTIALS +from postorius.tests import MM_VCR logger = logging.getLogger(__name__) @@ -35,7 +34,6 @@ vcr_log.setLevel(logging.WARNING) -@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 60b25a6..5565ed4 100644 --- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py +++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py @@ -20,13 +20,12 @@ from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.test import Client, TestCase -from django.test.utils import override_settings try: from urllib2 import HTTPError except ImportError: from urllib.error import HTTPError -from postorius.tests import MM_VCR, API_CREDENTIALS +from postorius.tests import MM_VCR from postorius.tests.utils import get_flash_messages from postorius.utils import get_client @@ -36,7 +35,6 @@ vcr_log.setLevel(logging.WARNING) -@override_settings(**API_CREDENTIALS) class TestSubscription(TestCase): """Tests subscription to lists"""