From 9edf3dd51d2fac484f3aaf9bc244b48c2b0182c1 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Mon, 13 Jul 2015 01:26:19 -0400 Subject: [PATCH] Add missing tearDown methods to tests. --- mayan/apps/dynamic_search/test_models.py | 8 ++++---- mayan/apps/folders/test_models.py | 9 +++++---- mayan/apps/permissions/test_models.py | 5 +++++ mayan/apps/sources/test_models.py | 4 ++++ mayan/apps/sources/test_views.py | 4 ++++ mayan/apps/tags/test_models.py | 21 +++++++++------------ 6 files changed, 31 insertions(+), 20 deletions(-) diff --git a/mayan/apps/dynamic_search/test_models.py b/mayan/apps/dynamic_search/test_models.py index 3f06c18b3f..52f11d0eb2 100644 --- a/mayan/apps/dynamic_search/test_models.py +++ b/mayan/apps/dynamic_search/test_models.py @@ -20,6 +20,10 @@ class DocumentSearchTestCase(TestCase): with open(TEST_SMALL_DOCUMENT_PATH) as file_object: self.document = self.document_type.new_document(file_object=File(file_object), label='mayan_11_1.pdf') + def tearDown(self): + self.document.delete() + self.document_type.delete() + def test_simple_search_after_related_name_change(self): """ Test that simple search works after related_name changes to @@ -40,7 +44,3 @@ class DocumentSearchTestCase(TestCase): model_list, result_set, elapsed_time = document_search.search({'versions__mimetype': self.document.file_mimetype}, user=self.admin_user) self.assertEqual(len(result_set), 1) self.assertEqual(list(model_list), [self.document]) - - def tearDown(self): - self.document.delete() - self.document_type.delete() diff --git a/mayan/apps/folders/test_models.py b/mayan/apps/folders/test_models.py index 5f89a933bb..90525290c8 100644 --- a/mayan/apps/folders/test_models.py +++ b/mayan/apps/folders/test_models.py @@ -27,6 +27,11 @@ class FolderTestCase(TestCase): self.user = User.objects.create_superuser(username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD) + def tearDown(self): + self.document.delete() + self.document_type.delete() + self.user.delete() + def test_creation_of_folder(self): folder = Folder.objects.create(label='test', user=self.user) @@ -55,7 +60,3 @@ class FolderTestCase(TestCase): self.assertEqual(list(folder.documents.all()), []) folder.delete() - - def tearDown(self): - self.document.delete() - self.document_type.delete() diff --git a/mayan/apps/permissions/test_models.py b/mayan/apps/permissions/test_models.py index c3853c6fc6..f084bfb558 100644 --- a/mayan/apps/permissions/test_models.py +++ b/mayan/apps/permissions/test_models.py @@ -17,6 +17,11 @@ class PermissionTestCase(TestCase): self.role = Role.objects.create(label='test role') Permission.invalidate_cache() + def tearDown(self): + self.role.delete() + self.group.delete() + self.user.delete() + def test_no_permissions(self): with self.assertRaises(PermissionDenied): Permission.check_permissions(requester=self.user, permissions=(permission_role_view,)) diff --git a/mayan/apps/sources/test_models.py b/mayan/apps/sources/test_models.py index e459900834..dc91d8c102 100644 --- a/mayan/apps/sources/test_models.py +++ b/mayan/apps/sources/test_models.py @@ -33,6 +33,10 @@ class UploadDocumentTestCase(TestCase): self.admin_user = User.objects.create_superuser(username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD) self.client = Client() + def tearDown(self): + self.document_type.delete() + self.admin_user.delete() + def test_issue_gh_163(self): """ Non-ASCII chars in document name failing in upload via watch folder #163 diff --git a/mayan/apps/sources/test_views.py b/mayan/apps/sources/test_views.py index 000086f48a..a2c3d67270 100644 --- a/mayan/apps/sources/test_views.py +++ b/mayan/apps/sources/test_views.py @@ -30,6 +30,10 @@ class UploadDocumentTestCase(TestCase): self.admin_user = User.objects.create_superuser(username=TEST_ADMIN_USERNAME, email=TEST_ADMIN_EMAIL, password=TEST_ADMIN_PASSWORD) self.client = Client() + def tearDown(self): + self.document_type.delete() + self.admin_user.delete() + def test_upload_a_document(self): # Login the admin user logged_in = self.client.login(username=TEST_ADMIN_USERNAME, password=TEST_ADMIN_PASSWORD) diff --git a/mayan/apps/tags/test_models.py b/mayan/apps/tags/test_models.py index bd4b5a20c8..87c28ae64a 100644 --- a/mayan/apps/tags/test_models.py +++ b/mayan/apps/tags/test_models.py @@ -17,17 +17,18 @@ TEST_DOCUMENT_PATH = os.path.join(settings.BASE_DIR, 'contrib', 'sample_document class TagTestCase(TestCase): def setUp(self): - self.document_type = DocumentType(label=TEST_DOCUMENT_TYPE) - self.document_type.save() + self.document_type = DocumentType.objects.create(label=TEST_DOCUMENT_TYPE) - self.document = Document( - document_type=self.document_type, - description='description', - ) - self.document.save() + ocr_settings = self.document_type.ocr_settings + ocr_settings.auto_ocr = False + ocr_settings.save() with open(TEST_DOCUMENT_PATH) as file_object: - self.document.new_version(file_object=File(file_object)) + self.document = self.document_type.new_document(file_object=File(file_object)) + + def tearDown(self): + self.document.delete() + self.document_type.delete() def runTest(self): tag = Tag(label='test', color=COLOR_RED) @@ -50,7 +51,3 @@ class TagTestCase(TestCase): self.assertEqual(list(tag.documents.all()), []) tag.delete() - - def tearDown(self): - self.document.delete() - self.document_type.delete()