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 ace9485..340b640 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_index.py +++ b/src/postorius/tests/mailman_api_tests/test_list_index.py @@ -40,7 +40,6 @@ @MM_VCR.use_cassette('test_list_index.yaml') def setUp(self): - self.client = Client() try: self.domain = get_client().create_domain('example.com') except HTTPError: 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 3da46a2..5e23e4f 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_members.py +++ b/src/postorius/tests/mailman_api_tests/test_list_members.py @@ -46,7 +46,6 @@ @MM_VCR.use_cassette('list_members_access.yaml') def setUp(self): - self.client = Client() try: self.domain = get_client().create_domain('example.com') except HTTPError: @@ -123,7 +122,6 @@ @MM_VCR.use_cassette('test_list_members_owner.yaml') def setUp(self): - self.client = Client() self.mm_client = get_client() try: self.domain = self.mm_client.create_domain('example.com') @@ -211,7 +209,6 @@ @MM_VCR.use_cassette('test_list_members_add_moderator.yaml') def setUp(self): - self.client = Client() try: self.domain = get_client().create_domain('example.com') except HTTPError: 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 6015391..4c6ed20 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_metrics.py +++ b/src/postorius/tests/mailman_api_tests/test_list_metrics.py @@ -30,7 +30,6 @@ @MM_VCR.use_cassette('test_list_metrics.yaml') def setUp(self): self.mm_client = get_client() - self.client = Client() try: self.domain = self.mm_client.create_domain('example.org') except HTTPError: 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 b8d1fdc..3549c65 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_new.py +++ b/src/postorius/tests/mailman_api_tests/test_list_new.py @@ -43,7 +43,6 @@ @MM_VCR.use_cassette('test_list_creation.yaml') def setUp(self): - self.client = Client() self.user = User.objects.create_user('user', 'user@example.com', 'pwd') self.superuser = User.objects.create_superuser('su', 'su@example.com', 'pwd') 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 b5c8b5d..c2e9a85 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_summary.py +++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py @@ -45,7 +45,6 @@ @MM_VCR.use_cassette('test_list_summary.yaml') def setUp(self): - self.client = Client() self.mmclient = get_client() try: domain = self.mmclient.create_domain('example.com') diff --git a/src/postorius/tests/mailman_api_tests/test_models.py b/src/postorius/tests/mailman_api_tests/test_models.py index f38d6bc..5285462 100644 --- a/src/postorius/tests/mailman_api_tests/test_models.py +++ b/src/postorius/tests/mailman_api_tests/test_models.py @@ -41,7 +41,6 @@ @MM_VCR.use_cassette('test_model.yaml') def setUp(self): - self.client = Client() self.mmclient = get_client() try: self.domain = get_client().create_domain('example.com') diff --git a/src/postorius/tests/test_address_activation.py b/src/postorius/tests/test_address_activation.py index adcd29c..c1e9f43 100644 --- a/src/postorius/tests/test_address_activation.py +++ b/src/postorius/tests/test_address_activation.py @@ -9,7 +9,7 @@ from django.core import mail from django.test.client import Client, RequestFactory from django.test.utils import override_settings -from django.utils import unittest +from django.test import TestCase from mock import patch, call from postorius.forms import AddressActivationForm @@ -18,7 +18,7 @@ from postorius.views.user import AddressActivationView, address_activation_link -class TestAddressActivationForm(unittest.TestCase): +class TestAddressActivationForm(TestCase): """ Test the activation form. """ @@ -48,7 +48,7 @@ self.assertFalse(form.is_valid()) -class TestAddressActivationView(unittest.TestCase): +class TestAddressActivationView(TestCase): """ Tests to make sure the view is properly connected, renders the form correctly and starts the actual address activation process if a valid @@ -60,7 +60,6 @@ # We don't use Client().login because it triggers the browserid dance. self.user = User.objects.create_user( username='les', email='les@example.org', password='secret') - self.client = Client() self.client.post(reverse('user_login'), {'username': 'les', 'password': 'secret'}) @@ -104,7 +103,7 @@ in [t.name for t in response.templates]) -class TestAddressConfirmationProfile(unittest.TestCase): +class TestAddressConfirmationProfile(TestCase): """ Test the confirmation of an email address activation (validating token, expiration, Mailman API calls etc.). @@ -186,7 +185,7 @@ self.assertIn("another-virtualhost", mail.outbox[0].body) -class TestAddressActivationLinkSuccess(unittest.TestCase): +class TestAddressActivationLinkSuccess(TestCase): """ This tests the activation link view if the key is valid and the profile is not expired. diff --git a/src/postorius/tests/test_auth_decorators.py b/src/postorius/tests/test_auth_decorators.py index 593e66b..6c8e9ce 100644 --- a/src/postorius/tests/test_auth_decorators.py +++ b/src/postorius/tests/test_auth_decorators.py @@ -18,7 +18,7 @@ from django.contrib.auth.models import AnonymousUser, User from django.core.exceptions import PermissionDenied from django.test.client import RequestFactory -from django.utils import unittest +from django.test import TestCase from mock import patch from postorius.auth.decorators import (list_owner_required, @@ -39,7 +39,7 @@ return True -class ListOwnerRequiredTest(unittest.TestCase): +class ListOwnerRequiredTest(TestCase): """Tests the list_owner_required auth decorator.""" def setUp(self): @@ -105,7 +105,7 @@ self.assertEqual(return_value, True) -class ListModeratorRequiredTest(unittest.TestCase): +class ListModeratorRequiredTest(TestCase): """Tests the list_owner_required auth decorator.""" def setUp(self): diff --git a/src/postorius/tests/test_forms.py b/src/postorius/tests/test_forms.py index 58717bd..f5cb781 100644 --- a/src/postorius/tests/test_forms.py +++ b/src/postorius/tests/test_forms.py @@ -14,13 +14,13 @@ # # You should have received a copy of the GNU General Public License along with # Postorius. If not, see . -from django.utils import unittest +from django.test import TestCase from postorius.forms import (ListNew, UserPreferences, DomainNew, ListSubscribe, ChangeSubscriptionForm) -class UserPreferencesTest(unittest.TestCase): +class UserPreferencesTest(TestCase): def test_form_fields_valid(self): form = UserPreferences({ @@ -31,7 +31,7 @@ }) self.assertTrue(form.is_valid()) -class DomainNewTest(unittest.TestCase): +class DomainNewTest(TestCase): def test_form_fields_webhost(self): form = DomainNew({ @@ -52,7 +52,7 @@ self.assertFalse(form.is_valid()) -class ListSubscribeTest(unittest.TestCase): +class ListSubscribeTest(TestCase): def test_subscribe_works(self): user_emails = ['someone@example.com'] form = ListSubscribe(user_emails, { @@ -78,7 +78,7 @@ }) self.assertFalse(form.is_valid()) -class ChangeSubscriptionTest(unittest.TestCase): +class ChangeSubscriptionTest(TestCase): def test_subscription_changes_only_to_user_addresses(self): user_emails = ['one@example.com', 'two@example.com'] form = ChangeSubscriptionForm(user_emails, @@ -92,7 +92,7 @@ self.assertTrue(form.is_valid()) -class ListNewTest(unittest.TestCase): +class ListNewTest(TestCase): def test_form_fields_list(self): form = ListNew({