diff --git a/src/postorius/tests/mailman_api_tests/test_domain_index.py b/src/postorius/tests/mailman_api_tests/test_domain_index.py index 7f1d9f2..3827c9f 100644 --- a/src/postorius/tests/mailman_api_tests/test_domain_index.py +++ b/src/postorius/tests/mailman_api_tests/test_domain_index.py @@ -63,7 +63,7 @@ self.superuser.delete() self.owner.delete() self.moderator.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_domain_index.yaml') def test_domain_index_not_accessible_to_public(self): diff --git a/src/postorius/tests/mailman_api_tests/test_domain_new.py b/src/postorius/tests/mailman_api_tests/test_domain_new.py index 6b0ca62..6565b1c 100644 --- a/src/postorius/tests/mailman_api_tests/test_domain_new.py +++ b/src/postorius/tests/mailman_api_tests/test_domain_new.py @@ -77,3 +77,4 @@ self.assertEqual(a_new_domain.base_url, u'http://example.com') self.assertEqual(a_new_domain.owners[0]['user_id'], get_client().get_user('su@example.com').user_id) + a_new_domain.delete() diff --git a/src/postorius/tests/mailman_api_tests/test_list_bans.py b/src/postorius/tests/mailman_api_tests/test_list_bans.py index 0c2e014..3797536 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_bans.py +++ b/src/postorius/tests/mailman_api_tests/test_list_bans.py @@ -46,8 +46,8 @@ @MM_VCR.use_cassette('list_bans.yaml') def setUp(self): # Create domain `example.com` in Mailman - example_com = get_client().create_domain('example.com') - self.m_list = example_com.create_list('test_list') + self.domain = get_client().create_domain('example.com') + self.m_list = self.domain.create_list('test_list') self.test_user = User.objects.create_user( 'test_user', 'test_user@example.com', 'pwd') self.test_superuser = User.objects.create_superuser( @@ -60,7 +60,7 @@ self.test_user.delete() self.test_superuser.delete() self.m_list.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('list_bans.yaml') def test_login_redirect_for_anonymous(self): 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 30c7706..5340c89 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_index.py +++ b/src/postorius/tests/mailman_api_tests/test_list_index.py @@ -46,7 +46,7 @@ def tearDown(self): for mlist in get_client().lists: mlist.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_list_index.yaml') def test_list_index_contains_the_lists(self): 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 c10c38d..f88d40b 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_members.py +++ b/src/postorius/tests/mailman_api_tests/test_list_members.py @@ -64,7 +64,7 @@ self.superuser.delete() self.owner.delete() self.moderator.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('list_members_access.yaml') def test_page_not_accessible_if_not_logged_in(self): @@ -123,7 +123,7 @@ def tearDown(self): self.foo_list.delete() self.su.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_list_members_owner_add_remove.yaml') def test_add_remove_owner(self): @@ -213,7 +213,7 @@ def tearDown(self): self.foo_list.delete() self.su.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_list_members_new_moderator_added.yaml') def test_new_moderator_added(self): @@ -226,14 +226,8 @@ @MM_VCR.use_cassette('list_members.yaml') def setUp(self): - try: - self.domain = get_client().create_domain('example.com') - except HTTPError: - self.domain = get_client().get_domain('example.com') - try: - self.foo_list = self.domain.create_list('foo') - except HTTPError: - self.foo_list = get_client().get_list('foo.example.com') + self.domain = get_client().create_domain('example.com') + self.foo_list = self.domain.create_list('foo') self.superuser = User.objects.create_superuser( 'testsu', 'su@example.com', 'testpass') @@ -241,6 +235,7 @@ def tearDown(self): self.foo_list.delete() self.superuser.delete() + self.domain.delete() @MM_VCR.use_cassette('list_members_show_members_page.yaml') def test_show_members_page(self): 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 1be5928..297a294 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_new.py +++ b/src/postorius/tests/mailman_api_tests/test_list_new.py @@ -52,7 +52,7 @@ self.superuser.delete() for mlist in get_client().lists: mlist.delete() - get_client().delete_domain('example.com') + self.domain.delete() def test_permission_denied(self): self.client.login(username='user', password='pwd') diff --git a/src/postorius/tests/mailman_api_tests/test_list_settings.py b/src/postorius/tests/mailman_api_tests/test_list_settings.py index 7cd2555..e3fd279 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_settings.py +++ b/src/postorius/tests/mailman_api_tests/test_list_settings.py @@ -69,7 +69,7 @@ self.superuser.delete() self.owner.delete() self.moderator.delete() - get_client().delete_domain('example.com') + self.domain.delete() def _check_redirect_login(self, url): response = self.client.get(url) 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 3e799f1..7d06798 100644 --- a/src/postorius/tests/mailman_api_tests/test_list_summary.py +++ b/src/postorius/tests/mailman_api_tests/test_list_summary.py @@ -44,12 +44,9 @@ @MM_VCR.use_cassette('test_list_summary.yaml') def setUp(self): self.mmclient = get_client() - domain = self.mmclient.create_domain('example.com') - self.foo_list = domain.create_list('foo') - try: - User.objects.create_user('testuser', 'test@example.com', 'testpass') - except IntegrityError: - pass + self.domain = self.mmclient.create_domain('example.com') + self.foo_list = self.domain.create_list('foo') + User.objects.create_user('testuser', 'test@example.com', 'testpass') @MM_VCR.use_cassette('test_list_summary.yaml') def tearDown(self): @@ -58,7 +55,7 @@ for user in self.mmclient.users: user.delete() User.objects.all().delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_list_summary.yaml') def test_list_summary_logged_out(self): diff --git a/src/postorius/tests/mailman_api_tests/test_models.py b/src/postorius/tests/mailman_api_tests/test_models.py index b121204..6adccaa 100644 --- a/src/postorius/tests/mailman_api_tests/test_models.py +++ b/src/postorius/tests/mailman_api_tests/test_models.py @@ -50,7 +50,7 @@ for user in self.mmclient.users: user.delete() User.objects.all().delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_model-2.yaml') def test_mailman_user_not_created_when_flag_is_off(self): diff --git a/src/postorius/tests/mailman_api_tests/test_subscriptions.py b/src/postorius/tests/mailman_api_tests/test_subscriptions.py index d0f25cf..2e37c77 100644 --- a/src/postorius/tests/mailman_api_tests/test_subscriptions.py +++ b/src/postorius/tests/mailman_api_tests/test_subscriptions.py @@ -68,7 +68,7 @@ self.open_list.delete() self.mod_list.delete() self.mm_user.delete() - get_client().delete_domain('example.com') + self.domain.delete() @MM_VCR.use_cassette('test_list_subscription_open_primary.yaml') def test_subscribe_open(self):