From 192cfacfcee06e3f87ea9eb3ec99efa67080e48e Mon Sep 17 00:00:00 2001 From: shamoon <4887959+shamoon@users.noreply.github.com> Date: Tue, 8 Apr 2025 19:25:01 -0700 Subject: [PATCH] More import fixes --- src/paperless/management/commands/mixins.py | 10 ++--- src/paperless/settings.py | 2 +- src/paperless/tests/test_api_bulk_edit.py | 42 ++++++++++---------- src/paperless/tests/test_api_documents.py | 2 +- src/paperless/tests/test_api_search.py | 2 +- src/paperless/tests/test_api_status.py | 2 +- src/paperless/tests/test_bulk_edit.py | 2 +- src/paperless/tests/test_checks.py | 4 +- src/paperless/tests/test_classifier.py | 14 +++---- src/paperless/tests/test_consumer.py | 36 ++++++++--------- src/paperless/tests/test_document_model.py | 4 +- src/paperless/tests/test_file_handling.py | 14 +++---- src/paperless/tests/test_index.py | 4 +- src/paperless/tests/test_parsers.py | 8 ++-- src/paperless/tests/test_task_signals.py | 2 +- src/paperless/tests/test_tasks.py | 2 +- src/paperless/tests/test_workflows.py | 8 ++-- src/paperless/tests/utils.py | 2 +- src/paperless_tesseract/tests/test_parser.py | 2 +- 19 files changed, 81 insertions(+), 81 deletions(-) diff --git a/src/paperless/management/commands/mixins.py b/src/paperless/management/commands/mixins.py index a2ad326e4..3e86ac7b8 100644 --- a/src/paperless/management/commands/mixins.py +++ b/src/paperless/management/commands/mixins.py @@ -8,11 +8,11 @@ from cryptography.hazmat.primitives import hashes from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC from django.core.management import CommandError -from documents.settings import EXPORTER_CRYPTO_ALGO_NAME -from documents.settings import EXPORTER_CRYPTO_KEY_ITERATIONS_NAME -from documents.settings import EXPORTER_CRYPTO_KEY_SIZE_NAME -from documents.settings import EXPORTER_CRYPTO_SALT_NAME -from documents.settings import EXPORTER_CRYPTO_SETTINGS_NAME +from paperless.settings import EXPORTER_CRYPTO_ALGO_NAME +from paperless.settings import EXPORTER_CRYPTO_KEY_ITERATIONS_NAME +from paperless.settings import EXPORTER_CRYPTO_KEY_SIZE_NAME +from paperless.settings import EXPORTER_CRYPTO_SALT_NAME +from paperless.settings import EXPORTER_CRYPTO_SETTINGS_NAME class CryptFields(TypedDict): diff --git a/src/paperless/settings.py b/src/paperless/settings.py index 5c1ad53d3..61ca66803 100644 --- a/src/paperless/settings.py +++ b/src/paperless/settings.py @@ -363,7 +363,7 @@ SPECTACULAR_SETTINGS = { "url": "https://docs.paperless-ngx.com/api/", }, "ENUM_NAME_OVERRIDES": { - "MatchingAlgorithm": "documents.models.MatchingModel.MATCHING_ALGORITHMS", + "MatchingAlgorithm": "paperless.models.MatchingModel.MATCHING_ALGORITHMS", }, } diff --git a/src/paperless/tests/test_api_bulk_edit.py b/src/paperless/tests/test_api_bulk_edit.py index b03d055d2..f39014bb1 100644 --- a/src/paperless/tests/test_api_bulk_edit.py +++ b/src/paperless/tests/test_api_bulk_edit.py @@ -183,7 +183,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.doc1.refresh_from_db() self.assertFalse(self.doc1.tags.filter(pk=self.t1.pk).exists()) - @mock.patch("documents.serialisers.bulk_edit.modify_tags") + @mock.patch("paperless.serialisers.bulk_edit.modify_tags") def test_api_modify_tags(self, m): self.setup_mock(m, "modify_tags") response = self.client.post( @@ -207,7 +207,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(kwargs["add_tags"], [self.t1.id]) self.assertEqual(kwargs["remove_tags"], [self.t2.id]) - @mock.patch("documents.serialisers.bulk_edit.modify_tags") + @mock.patch("paperless.serialisers.bulk_edit.modify_tags") def test_api_modify_tags_not_provided(self, m): """ GIVEN: @@ -235,7 +235,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) m.assert_not_called() - @mock.patch("documents.serialisers.bulk_edit.modify_custom_fields") + @mock.patch("paperless.serialisers.bulk_edit.modify_custom_fields") def test_api_modify_custom_fields(self, m): self.setup_mock(m, "modify_custom_fields") response = self.client.post( @@ -261,7 +261,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(kwargs["add_custom_fields"], [self.cf1.id]) self.assertEqual(kwargs["remove_custom_fields"], [self.cf2.id]) - @mock.patch("documents.serialisers.bulk_edit.modify_custom_fields") + @mock.patch("paperless.serialisers.bulk_edit.modify_custom_fields") def test_api_modify_custom_fields_with_values(self, m): self.setup_mock(m, "modify_custom_fields") response = self.client.post( @@ -285,7 +285,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(kwargs["add_custom_fields"], {str(self.cf1.id): "foo"}) self.assertEqual(kwargs["remove_custom_fields"], [self.cf2.id]) - @mock.patch("documents.serialisers.bulk_edit.modify_custom_fields") + @mock.patch("paperless.serialisers.bulk_edit.modify_custom_fields") def test_api_modify_custom_fields_invalid_params(self, m): """ GIVEN: @@ -405,7 +405,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) m.assert_not_called() - @mock.patch("documents.serialisers.bulk_edit.delete") + @mock.patch("paperless.serialisers.bulk_edit.delete") def test_api_delete(self, m): self.setup_mock(m, "delete") response = self.client.post( @@ -421,7 +421,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(args[0], [self.doc1.id]) self.assertEqual(len(kwargs), 0) - @mock.patch("documents.serialisers.bulk_edit.set_storage_path") + @mock.patch("paperless.serialisers.bulk_edit.set_storage_path") def test_api_set_storage_path(self, m): """ GIVEN: @@ -451,7 +451,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertListEqual(args[0], [self.doc1.id]) self.assertEqual(kwargs["storage_path"], self.sp1.id) - @mock.patch("documents.serialisers.bulk_edit.set_storage_path") + @mock.patch("paperless.serialisers.bulk_edit.set_storage_path") def test_api_unset_storage_path(self, m): """ GIVEN: @@ -772,7 +772,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): ], ) - @mock.patch("documents.serialisers.bulk_edit.set_permissions") + @mock.patch("paperless.serialisers.bulk_edit.set_permissions") def test_set_permissions(self, m): self.setup_mock(m, "set_permissions") user1 = User.objects.create(username="user1") @@ -807,7 +807,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertCountEqual(args[0], [self.doc2.id, self.doc3.id]) self.assertEqual(len(kwargs["set_permissions"]["view"]["users"]), 2) - @mock.patch("documents.serialisers.bulk_edit.set_permissions") + @mock.patch("paperless.serialisers.bulk_edit.set_permissions") def test_set_permissions_merge(self, m): self.setup_mock(m, "set_permissions") user1 = User.objects.create(username="user1") @@ -859,8 +859,8 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): args, kwargs = m.call_args self.assertEqual(kwargs["merge"], True) - @mock.patch("documents.serialisers.bulk_edit.set_storage_path") - @mock.patch("documents.serialisers.bulk_edit.merge") + @mock.patch("paperless.serialisers.bulk_edit.set_storage_path") + @mock.patch("paperless.serialisers.bulk_edit.merge") def test_insufficient_global_perms(self, mock_merge, mock_set_storage): """ GIVEN: @@ -927,7 +927,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_403_FORBIDDEN) mock_merge.assert_not_called() - @mock.patch("documents.serialisers.bulk_edit.set_permissions") + @mock.patch("paperless.serialisers.bulk_edit.set_permissions") def test_insufficient_permissions_ownership(self, m): """ GIVEN: @@ -981,7 +981,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) m.assert_called_once() - @mock.patch("documents.serialisers.bulk_edit.set_storage_path") + @mock.patch("paperless.serialisers.bulk_edit.set_storage_path") def test_insufficient_permissions_edit(self, m): """ GIVEN: @@ -1035,7 +1035,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): m.assert_called_once() - @mock.patch("documents.serialisers.bulk_edit.rotate") + @mock.patch("paperless.serialisers.bulk_edit.rotate") def test_rotate(self, m): self.setup_mock(m, "rotate") response = self.client.post( @@ -1057,7 +1057,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertCountEqual(args[0], [self.doc2.id, self.doc3.id]) self.assertEqual(kwargs["degrees"], 90) - @mock.patch("documents.serialisers.bulk_edit.rotate") + @mock.patch("paperless.serialisers.bulk_edit.rotate") def test_rotate_invalid_params(self, m): response = self.client.post( "/api/documents/bulk_edit/", @@ -1089,7 +1089,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): m.assert_not_called() - @mock.patch("documents.serialisers.bulk_edit.merge") + @mock.patch("paperless.serialisers.bulk_edit.merge") def test_merge(self, m): self.setup_mock(m, "merge") response = self.client.post( @@ -1112,7 +1112,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(kwargs["metadata_document_id"], self.doc3.id) self.assertEqual(kwargs["user"], self.user) - @mock.patch("documents.serialisers.bulk_edit.merge") + @mock.patch("paperless.serialisers.bulk_edit.merge") def test_merge_and_delete_insufficient_permissions(self, m): self.doc1.owner = User.objects.get(username="temp_admin") self.doc1.save() @@ -1159,7 +1159,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_200_OK) m.assert_called_once() - @mock.patch("documents.serialisers.bulk_edit.merge") + @mock.patch("paperless.serialisers.bulk_edit.merge") def test_merge_invalid_parameters(self, m): """ GIVEN: @@ -1188,7 +1188,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) m.assert_not_called() - @mock.patch("documents.serialisers.bulk_edit.split") + @mock.patch("paperless.serialisers.bulk_edit.split") def test_split(self, m): self.setup_mock(m, "split") response = self.client.post( @@ -1278,7 +1278,7 @@ class TestBulkEditAPI(DirectoriesMixin, APITestCase): self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST) self.assertIn(b"delete_originals must be a boolean", response.content) - @mock.patch("documents.serialisers.bulk_edit.delete_pages") + @mock.patch("paperless.serialisers.bulk_edit.delete_pages") def test_delete_pages(self, m): self.setup_mock(m, "delete_pages") response = self.client.post( diff --git a/src/paperless/tests/test_api_documents.py b/src/paperless/tests/test_api_documents.py index 57ec8077f..0c5165ec9 100644 --- a/src/paperless/tests/test_api_documents.py +++ b/src/paperless/tests/test_api_documents.py @@ -1702,7 +1702,7 @@ class TestDocumentApi(DirectoriesMixin, DocumentConsumeDelayMixin, APITestCase): response = self.client.get(f"/api/documents/{doc.pk}/suggestions/") self.assertEqual(response.status_code, status.HTTP_200_OK) - @mock.patch("documents.parsers.parse_date_generator") + @mock.patch("paperless.parsers.parse_date_generator") @override_settings(NUMBER_OF_SUGGESTED_DATES=0) def test_get_suggestions_dates_disabled( self, diff --git a/src/paperless/tests/test_api_search.py b/src/paperless/tests/test_api_search.py index 78413e9f8..fd6d4d22e 100644 --- a/src/paperless/tests/test_api_search.py +++ b/src/paperless/tests/test_api_search.py @@ -486,7 +486,7 @@ class TestDocumentSearchApi(DirectoriesMixin, APITestCase): # Expect 0 document returned self.assertEqual(len(results), 0) - @mock.patch("documents.index.autocomplete") + @mock.patch("paperless.index.autocomplete") def test_search_autocomplete_limits(self, m): """ GIVEN: diff --git a/src/paperless/tests/test_api_status.py b/src/paperless/tests/test_api_status.py index 39c385ceb..c7da7b5eb 100644 --- a/src/paperless/tests/test_api_status.py +++ b/src/paperless/tests/test_api_status.py @@ -170,7 +170,7 @@ class TestSystemStatus(APITestCase): self.assertIsNotNone(response.data["tasks"]["index_last_modified"]) @override_settings(INDEX_DIR=Path("/tmp/index/")) - @mock.patch("documents.index.open_index", autospec=True) + @mock.patch("paperless.index.open_index", autospec=True) def test_system_status_index_error(self, mock_open_index): """ GIVEN: diff --git a/src/paperless/tests/test_bulk_edit.py b/src/paperless/tests/test_bulk_edit.py index 37aecbff0..eea97f09b 100644 --- a/src/paperless/tests/test_bulk_edit.py +++ b/src/paperless/tests/test_bulk_edit.py @@ -428,7 +428,7 @@ class TestBulkEdit(DirectoriesMixin, TestCase): ) self.assertEqual(groups_with_perms.count(), 2) - @mock.patch("documents.models.Document.delete") + @mock.patch("paperless.models.Document.delete") def test_delete_documents_old_uuid_field(self, m): m.side_effect = Exception("Data too long for column 'transaction_id' at row 1") doc_ids = [self.doc1.id, self.doc2.id, self.doc3.id] diff --git a/src/paperless/tests/test_checks.py b/src/paperless/tests/test_checks.py index b29b6e3fb..22ab88e8c 100644 --- a/src/paperless/tests/test_checks.py +++ b/src/paperless/tests/test_checks.py @@ -44,7 +44,7 @@ class TestDocumentChecks(TestCase): PASSPHRASE="test", ) @mock.patch("paperless.db.GnuPG.decrypted") - @mock.patch("documents.models.Document.source_file") + @mock.patch("paperless.models.Document.source_file") def test_encrypted_decrypt_fails(self, mock_decrypted, mock_source_file): mock_decrypted.return_value = None mock_source_file.return_value = b"" @@ -72,7 +72,7 @@ class TestDocumentChecks(TestCase): def test_parser_check(self): self.assertEqual(parser_check(None), []) - with mock.patch("documents.checks.document_consumer_declaration.send") as m: + with mock.patch("paperless.checks.document_consumer_declaration.send") as m: m.return_value = [] self.assertEqual( diff --git a/src/paperless/tests/test_classifier.py b/src/paperless/tests/test_classifier.py index 434ad5ab9..16023ea55 100644 --- a/src/paperless/tests/test_classifier.py +++ b/src/paperless/tests/test_classifier.py @@ -314,7 +314,7 @@ class TestClassifier(DirectoriesMixin, TestCase): current_ver = DocumentClassifier.FORMAT_VERSION with mock.patch( - "documents.classifier.DocumentClassifier.FORMAT_VERSION", + "paperless.classifier.DocumentClassifier.FORMAT_VERSION", current_ver + 1, ): # assure that we won't load old classifiers. @@ -343,7 +343,7 @@ class TestClassifier(DirectoriesMixin, TestCase): self.assertCountEqual(new_classifier.predict_tags(self.doc2.content), [45, 12]) - @mock.patch("documents.classifier.pickle.load") + @mock.patch("paperless.classifier.pickle.load") def test_load_corrupt_file(self, patched_pickle_load: mock.MagicMock): """ GIVEN: @@ -619,7 +619,7 @@ class TestClassifier(DirectoriesMixin, TestCase): self.assertFalse(Path(settings.MODEL_FILE).exists()) self.assertIsNone(load_classifier()) - @mock.patch("documents.classifier.DocumentClassifier.load") + @mock.patch("paperless.classifier.DocumentClassifier.load") def test_load_classifier(self, load): Path(settings.MODEL_FILE).touch() self.assertIsNotNone(load_classifier()) @@ -640,11 +640,11 @@ class TestClassifier(DirectoriesMixin, TestCase): classifier = load_classifier() self.assertIsNotNone(classifier) - with mock.patch("documents.classifier.DocumentClassifier.load") as load: + with mock.patch("paperless.classifier.DocumentClassifier.load") as load: load_classifier() load.assert_not_called() - @mock.patch("documents.classifier.DocumentClassifier.load") + @mock.patch("paperless.classifier.DocumentClassifier.load") def test_load_classifier_incompatible_version(self, load): Path(settings.MODEL_FILE).touch() self.assertTrue(Path(settings.MODEL_FILE).exists()) @@ -653,7 +653,7 @@ class TestClassifier(DirectoriesMixin, TestCase): self.assertIsNone(load_classifier()) self.assertFalse(Path(settings.MODEL_FILE).exists()) - @mock.patch("documents.classifier.DocumentClassifier.load") + @mock.patch("paperless.classifier.DocumentClassifier.load") def test_load_classifier_os_error(self, load): Path(settings.MODEL_FILE).touch() self.assertTrue(Path(settings.MODEL_FILE).exists()) @@ -673,7 +673,7 @@ class TestClassifier(DirectoriesMixin, TestCase): classifier = load_classifier() self.assertIsNone(classifier) - @mock.patch("documents.classifier.DocumentClassifier.load") + @mock.patch("paperless.classifier.DocumentClassifier.load") def test_load_classifier_raise_exception(self, mock_load): Path(settings.MODEL_FILE).touch() mock_load.side_effect = IncompatibleClassifierVersionError("Dummy Error") diff --git a/src/paperless/tests/test_consumer.py b/src/paperless/tests/test_consumer.py index 98bb11919..62be8c154 100644 --- a/src/paperless/tests/test_consumer.py +++ b/src/paperless/tests/test_consumer.py @@ -114,7 +114,7 @@ def fake_magic_from_file(file, *, mime=False): return "A verbose string that describes the contents of the file" -@mock.patch("documents.consumer.magic.from_file", fake_magic_from_file) +@mock.patch("paperless.consumer.magic.from_file", fake_magic_from_file) class TestConsumer( DirectoriesMixin, FileSystemAssertsMixin, @@ -163,7 +163,7 @@ class TestConsumer( def setUp(self): super().setUp() - patcher = mock.patch("documents.parsers.document_consumer_declaration.send") + patcher = mock.patch("paperless.parsers.document_consumer_declaration.send") m = patcher.start() m.return_value = [ ( @@ -569,7 +569,7 @@ class TestConsumer( with self.assertRaisesMessage(ConsumerError, "document is in the trash"): consumer.run() - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def testNoParsers(self, m): m.return_value = [] @@ -582,7 +582,7 @@ class TestConsumer( self._assert_first_last_send_progress(last_status="FAILED") - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def testFaultyParser(self, m): m.return_value = [ ( @@ -604,7 +604,7 @@ class TestConsumer( self._assert_first_last_send_progress(last_status="FAILED") - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def testGenericParserException(self, m): m.return_value = [ ( @@ -626,7 +626,7 @@ class TestConsumer( self._assert_first_last_send_progress(last_status="FAILED") - @mock.patch("documents.consumer.ConsumerPlugin._write") + @mock.patch("paperless.consumer.ConsumerPlugin._write") def testPostSaveError(self, m): filename = self.get_test_file() m.side_effect = OSError("NO.") @@ -663,7 +663,7 @@ class TestConsumer( self._assert_first_last_send_progress() @override_settings(FILENAME_FORMAT="{correspondent}/{title}") - @mock.patch("documents.signals.handlers.generate_unique_filename") + @mock.patch("paperless.signals.handlers.generate_unique_filename") def testFilenameHandlingUnstableFormat(self, m): filenames = ["this", "that", "now this", "i cannot decide"] @@ -691,7 +691,7 @@ class TestConsumer( self._assert_first_last_send_progress() - @mock.patch("documents.consumer.load_classifier") + @mock.patch("paperless.consumer.load_classifier") def testClassifyDocument(self, m): correspondent = Correspondent.objects.create( name="test", @@ -775,7 +775,7 @@ class TestConsumer( self._assert_first_last_send_progress(last_status="FAILED") @override_settings(FILENAME_FORMAT="{title}") - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def test_similar_filenames(self, m): shutil.copy( Path(__file__).parent / "samples" / "simple.pdf", @@ -826,7 +826,7 @@ class TestConsumer( sanity_check() - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") def test_try_to_clean_invalid_pdf(self, m): shutil.copy( Path(__file__).parent / "samples" / "invalid_pdf.pdf", @@ -849,7 +849,7 @@ class TestConsumer( @mock.patch("paperless_mail.models.MailRule.objects.get") @mock.patch("paperless_mail.parsers.MailDocumentParser.parse") - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def test_mail_parser_receives_mailrule( self, mock_consumer_declaration_send: mock.Mock, @@ -901,7 +901,7 @@ class TestConsumer( ) -@mock.patch("documents.consumer.magic.from_file", fake_magic_from_file) +@mock.patch("paperless.consumer.magic.from_file", fake_magic_from_file) class TestConsumerCreatedDate(DirectoriesMixin, GetConsumerMixin, TestCase): def setUp(self): super().setUp() @@ -1040,21 +1040,21 @@ class PreConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase): self.test_file = self.dirs.scratch_dir / "sample.pdf" shutil.copy(src, self.test_file) - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") @override_settings(PRE_CONSUME_SCRIPT=None) def test_no_pre_consume_script(self, m): with self.get_consumer(self.test_file) as c: c.run() m.assert_not_called() - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") @override_settings(PRE_CONSUME_SCRIPT="does-not-exist") def test_pre_consume_script_not_found(self, m): with self.get_consumer(self.test_file) as c: self.assertRaises(ConsumerError, c.run) m.assert_not_called() - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") def test_pre_consume_script(self, m): with tempfile.NamedTemporaryFile() as script: with override_settings(PRE_CONSUME_SCRIPT=script.name): @@ -1151,7 +1151,7 @@ class PostConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase): self.test_file = self.dirs.scratch_dir / "sample.pdf" shutil.copy(src, self.test_file) - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") @override_settings(POST_CONSUME_SCRIPT=None) def test_no_post_consume_script(self, m): doc = Document.objects.create(title="Test", mime_type="application/pdf") @@ -1175,7 +1175,7 @@ class PostConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase): ): consumer.run_post_consume_script(doc) - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") def test_post_consume_script_simple(self, m): with tempfile.NamedTemporaryFile() as script: with override_settings(POST_CONSUME_SCRIPT=script.name): @@ -1186,7 +1186,7 @@ class PostConsumeTestCase(DirectoriesMixin, GetConsumerMixin, TestCase): m.assert_called_once() - @mock.patch("documents.consumer.run_subprocess") + @mock.patch("paperless.consumer.run_subprocess") def test_post_consume_script_with_correspondent(self, m): with tempfile.NamedTemporaryFile() as script: with override_settings(POST_CONSUME_SCRIPT=script.name): diff --git a/src/paperless/tests/test_document_model.py b/src/paperless/tests/test_document_model.py index 633aaa708..3aa72b462 100644 --- a/src/paperless/tests/test_document_model.py +++ b/src/paperless/tests/test_document_model.py @@ -42,7 +42,7 @@ class TestDocument(TestCase): Path(file_path).touch() Path(thumb_path).touch() - with mock.patch("documents.signals.handlers.os.unlink") as mock_unlink: + with mock.patch("paperless.signals.handlers.os.unlink") as mock_unlink: document.delete() empty_trash([document.pk]) mock_unlink.assert_any_call(file_path) @@ -64,7 +64,7 @@ class TestDocument(TestCase): Path(file_path).touch() Path(thumb_path).touch() - with mock.patch("documents.signals.handlers.os.unlink") as mock_unlink: + with mock.patch("paperless.signals.handlers.os.unlink") as mock_unlink: document.delete() self.assertEqual(mock_unlink.call_count, 0) diff --git a/src/paperless/tests/test_file_handling.py b/src/paperless/tests/test_file_handling.py index 71777a1d5..07cb556aa 100644 --- a/src/paperless/tests/test_file_handling.py +++ b/src/paperless/tests/test_file_handling.py @@ -150,7 +150,7 @@ class TestFileHandling(DirectoriesMixin, FileSystemAssertsMixin, TestCase): with ( mock.patch( - "documents.signals.handlers.Document.global_objects.filter", + "paperless.signals.handlers.Document.global_objects.filter", ) as m, disable_auditlog(), ): @@ -493,8 +493,8 @@ class TestFileHandling(DirectoriesMixin, FileSystemAssertsMixin, TestCase): self.assertEqual(document2.filename, "qwe.pdf") @override_settings(FILENAME_FORMAT="{title}") - @mock.patch("documents.signals.handlers.Document.objects.filter") - @mock.patch("documents.signals.handlers.shutil.move") + @mock.patch("paperless.signals.handlers.Document.objects.filter") + @mock.patch("paperless.signals.handlers.shutil.move") def test_no_move_only_save(self, mock_move, mock_filter): """ GIVEN: @@ -530,7 +530,7 @@ class TestFileHandling(DirectoriesMixin, FileSystemAssertsMixin, TestCase): @override_settings( FILENAME_FORMAT="{{title}}_{{custom_fields|get_cf_value('test')}}", ) - @mock.patch("documents.signals.handlers.update_filename_and_move_files") + @mock.patch("paperless.signals.handlers.update_filename_and_move_files") def test_select_cf_updated(self, m): """ GIVEN: @@ -719,7 +719,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, FileSystemAssertsMixin, Test self.assertIsFile(doc.archive_path) @override_settings(FILENAME_FORMAT="{correspondent}/{title}") - @mock.patch("documents.signals.handlers.shutil.move") + @mock.patch("paperless.signals.handlers.shutil.move") def test_move_archive_error(self, m): def fake_rename(src, dst): if "archive" in str(src): @@ -770,7 +770,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, FileSystemAssertsMixin, Test self.assertIsFile(doc.archive_path) @override_settings(FILENAME_FORMAT="{correspondent}/{title}") - @mock.patch("documents.signals.handlers.shutil.move") + @mock.patch("paperless.signals.handlers.shutil.move") def test_move_file_error(self, m): def fake_rename(src, dst): if "original" in str(src): @@ -878,7 +878,7 @@ class TestFileHandlingWithArchive(DirectoriesMixin, FileSystemAssertsMixin, Test archive_checksum="B", ) with mock.patch( - "documents.signals.handlers.Document.global_objects.filter", + "paperless.signals.handlers.Document.global_objects.filter", ) as m: m.side_effect = DatabaseError() doc.save() diff --git a/src/paperless/tests/test_index.py b/src/paperless/tests/test_index.py index 99d92353f..0531c5664 100644 --- a/src/paperless/tests/test_index.py +++ b/src/paperless/tests/test_index.py @@ -54,7 +54,7 @@ class TestAutoComplete(DirectoriesMixin, TestCase): ) with self.assertLogs("paperless.index", level="ERROR") as cm: with mock.patch( - "documents.index.AsyncWriter.update_document", + "paperless.index.AsyncWriter.update_document", ) as mocked_update_doc: index.add_or_update_document(doc1) @@ -82,7 +82,7 @@ class TestAutoComplete(DirectoriesMixin, TestCase): content="test test2 test3", ) with mock.patch( - "documents.index.AsyncWriter.update_document", + "paperless.index.AsyncWriter.update_document", ) as mocked_update_doc: index.add_or_update_document(doc1) diff --git a/src/paperless/tests/test_parsers.py b/src/paperless/tests/test_parsers.py index 995fb5fa0..1ab36e305 100644 --- a/src/paperless/tests/test_parsers.py +++ b/src/paperless/tests/test_parsers.py @@ -15,7 +15,7 @@ from paperless_tika.parsers import TikaDocumentParser class TestParserDiscovery(TestCase): - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def test_get_parser_class_1_parser(self, m, *args): """ GIVEN: @@ -42,7 +42,7 @@ class TestParserDiscovery(TestCase): self.assertEqual(get_parser_class_for_mime_type("application/pdf"), DummyParser) - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def test_get_parser_class_n_parsers(self, m, *args): """ GIVEN: @@ -84,7 +84,7 @@ class TestParserDiscovery(TestCase): DummyParser2, ) - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def test_get_parser_class_0_parsers(self, m, *args): """ GIVEN: @@ -98,7 +98,7 @@ class TestParserDiscovery(TestCase): with TemporaryDirectory(): self.assertIsNone(get_parser_class_for_mime_type("application/pdf")) - @mock.patch("documents.parsers.document_consumer_declaration.send") + @mock.patch("paperless.parsers.document_consumer_declaration.send") def test_get_parser_class_no_valid_parser(self, m, *args): """ GIVEN: diff --git a/src/paperless/tests/test_task_signals.py b/src/paperless/tests/test_task_signals.py index 5aaab2daf..d3e5cd34d 100644 --- a/src/paperless/tests/test_task_signals.py +++ b/src/paperless/tests/test_task_signals.py @@ -16,7 +16,7 @@ from paperless.tests.test_consumer import fake_magic_from_file from paperless.tests.utils import DirectoriesMixin -@mock.patch("documents.consumer.magic.from_file", fake_magic_from_file) +@mock.patch("paperless.consumer.magic.from_file", fake_magic_from_file) class TestTaskSignalHandler(DirectoriesMixin, TestCase): def util_call_before_task_publish_handler(self, headers_to_use, body_to_use): """ diff --git a/src/paperless/tests/test_tasks.py b/src/paperless/tests/test_tasks.py index 7f6da9746..f9b7e30c8 100644 --- a/src/paperless/tests/test_tasks.py +++ b/src/paperless/tests/test_tasks.py @@ -81,7 +81,7 @@ class TestClassifier(DirectoriesMixin, FileSystemAssertsMixin, TestCase): self.assertIsNotFile(settings.MODEL_FILE) with mock.patch( - "documents.classifier.DocumentClassifier.preprocess_content", + "paperless.classifier.DocumentClassifier.preprocess_content", ) as pre_proc_mock: pre_proc_mock.side_effect = dummy_preprocess diff --git a/src/paperless/tests/test_workflows.py b/src/paperless/tests/test_workflows.py index 8d3604f2c..ca66a2cc7 100644 --- a/src/paperless/tests/test_workflows.py +++ b/src/paperless/tests/test_workflows.py @@ -1412,7 +1412,7 @@ class TestWorkflows( doc.refresh_from_db() self.assertEqual(doc.owner, self.user2) - @mock.patch("documents.models.Document.objects.filter", autospec=True) + @mock.patch("paperless.models.Document.objects.filter", autospec=True) def test_workflow_scheduled_trigger_modified(self, mock_filter): """ GIVEN: @@ -2384,7 +2384,7 @@ class TestWorkflows( @override_settings( PAPERLESS_URL="http://localhost:8000", ) - @mock.patch("documents.signals.handlers.send_webhook.delay") + @mock.patch("paperless.signals.handlers.send_webhook.delay") def test_workflow_webhook_action_body(self, mock_post): """ GIVEN: @@ -2443,7 +2443,7 @@ class TestWorkflows( @override_settings( PAPERLESS_URL="http://localhost:8000", ) - @mock.patch("documents.signals.handlers.send_webhook.delay") + @mock.patch("paperless.signals.handlers.send_webhook.delay") def test_workflow_webhook_action_w_files(self, mock_post): """ GIVEN: @@ -2649,7 +2649,7 @@ class TestWorkflows( ) self.assertIn(expected_str, cm.output[0]) - @mock.patch("documents.signals.handlers.send_webhook.delay") + @mock.patch("paperless.signals.handlers.send_webhook.delay") def test_workflow_webhook_action_consumption(self, mock_post): """ GIVEN: diff --git a/src/paperless/tests/utils.py b/src/paperless/tests/utils.py index 9c2e52f4f..a0f7c14b2 100644 --- a/src/paperless/tests/utils.py +++ b/src/paperless/tests/utils.py @@ -213,7 +213,7 @@ class ConsumerProgressMixin: def setUp(self) -> None: self.send_progress_patcher = mock.patch( - "documents.consumer.Consumer._send_progress", + "paperless.consumer.Consumer._send_progress", ) self.send_progress_mock = self.send_progress_patcher.start() super().setUp() diff --git a/src/paperless_tesseract/tests/test_parser.py b/src/paperless_tesseract/tests/test_parser.py index e4ffb39ae..a1b2b31c3 100644 --- a/src/paperless_tesseract/tests/test_parser.py +++ b/src/paperless_tesseract/tests/test_parser.py @@ -107,7 +107,7 @@ class TestParser(DirectoriesMixin, FileSystemAssertsMixin, TestCase): ) self.assertIsFile(thumb) - @mock.patch("documents.parsers.run_convert") + @mock.patch("paperless.parsers.run_convert") def test_thumbnail_fallback(self, m): def call_convert(input_file, output_file, **kwargs): if ".pdf" in input_file: