A community-supported supercharged document management system: scan, index and archive all your documents
Python aiangulararchivingdjangodmsdocument-managementdocument-management-systemllmmachine-learningocroptical-character-recognitionpdf
Chore: Move unittest directory setup onto the shared fixture (#14172)
Trenton Hf440e8d33c53
diff --git a/src/documents/tests/test_admin.py b/src/documents/tests/test_admin.pyindex e90808784..6e018eba8 100644--- a/src/documents/tests/test_admin.py+++ b/src/documents/tests/test_admin.py@@ -16,8 +16,8 @@ from documents.models import Documentfrom documents.models import Tagfrom documents.search import get_backendfrom documents.search import reset_backend-from documents.tests.utils import DirectoriesMixinfrom paperless.admin import PaperlessUserAdmin+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import DocumentFactoryfrom paperless_testing.factories import TagFactoryfrom paperless_testing.factories import UserFactorydiff --git a/src/documents/tests/test_api_app_config.py b/src/documents/tests/test_api_app_config.pyindex 8620c3ec3..e6d3fc7af 100644--- a/src/documents/tests/test_api_app_config.py+++ b/src/documents/tests/test_api_app_config.py@@ -11,10 +11,10 @@ from PIL.PngImagePlugin import PngInfofrom rest_framework import statusfrom rest_framework.test import APITestCase-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import read_streaming_responsefrom paperless.models import ApplicationConfigurationfrom paperless.models import ColorConvertChoices+from paperless_testing.dirs import DirectoriesMixinclass TestApiAppConfig(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_bulk_download.py b/src/documents/tests/test_api_bulk_download.pyindex b4f243005..912eefdc6 100644--- a/src/documents/tests/test_api_bulk_download.py+++ b/src/documents/tests/test_api_bulk_download.py@@ -14,9 +14,9 @@ from rest_framework.test import APITestCasefrom documents.models import Correspondentfrom documents.models import Documentfrom documents.models import DocumentType-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import SampleDirMixinfrom documents.tests.utils import read_streaming_response+from paperless_testing.dirs import DirectoriesMixinclass TestBulkDownload(DirectoriesMixin, SampleDirMixin, APITestCase):diff --git a/src/documents/tests/test_api_bulk_edit.py b/src/documents/tests/test_api_bulk_edit.pyindex 0657a98cc..7e861e6e1 100644--- a/src/documents/tests/test_api_bulk_edit.py+++ b/src/documents/tests/test_api_bulk_edit.py@@ -15,7 +15,7 @@ from documents.models import Documentfrom documents.models import DocumentTypefrom documents.models import StoragePathfrom documents.models import Tag-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestBulkEditAPI(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_custom_fields.py b/src/documents/tests/test_api_custom_fields.pyindex 8ad69dd0d..adcd41615 100644--- a/src/documents/tests/test_api_custom_fields.py+++ b/src/documents/tests/test_api_custom_fields.py@@ -13,7 +13,7 @@ from rest_framework.test import APITestCasefrom documents.models import CustomFieldfrom documents.models import CustomFieldInstancefrom documents.models import Document-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestCustomFieldsAPI(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_document_versions.py b/src/documents/tests/test_api_document_versions.pyindex f8edd8815..d7241b54a 100644--- a/src/documents/tests/test_api_document_versions.py+++ b/src/documents/tests/test_api_document_versions.py@@ -18,10 +18,10 @@ from documents.data_models import DocumentSourcefrom documents.filters import EffectiveContentFilterfrom documents.filters import TitleContentFilterfrom documents.models import Document-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import read_streaming_responsefrom documents.versioning import annotate_effective_contentfrom documents.views import DocumentSelectionMixin+from paperless_testing.dirs import DirectoriesMixinif TYPE_CHECKING:from pathlib import Pathdiff --git a/src/documents/tests/test_api_documents.py b/src/documents/tests/test_api_documents.pyindex 8c17926c5..1b5dc48eb 100644--- a/src/documents/tests/test_api_documents.py+++ b/src/documents/tests/test_api_documents.py@@ -49,8 +49,8 @@ from documents.models import WorkflowActionfrom documents.models import WorkflowTriggerfrom documents.signals.handlers import run_workflowsfrom documents.tests.utils import ConsumeTaskMixin-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import read_streaming_response+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import DocumentFactoryfrom paperless_testing.factories import TagFactorydiff --git a/src/documents/tests/test_api_email.py b/src/documents/tests/test_api_email.pyindex 90a629e1a..e404e3037 100644--- a/src/documents/tests/test_api_email.py+++ b/src/documents/tests/test_api_email.py@@ -10,8 +10,8 @@ from rest_framework import statusfrom rest_framework.test import APITestCasefrom documents.models import Document-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import SampleDirMixin+from paperless_testing.dirs import DirectoriesMixinclass TestEmail(DirectoriesMixin, SampleDirMixin, APITestCase):diff --git a/src/documents/tests/test_api_filter_by_custom_fields.py b/src/documents/tests/test_api_filter_by_custom_fields.pyindex 0c4f9f37c..0c51169c1 100644--- a/src/documents/tests/test_api_filter_by_custom_fields.py+++ b/src/documents/tests/test_api_filter_by_custom_fields.py@@ -13,7 +13,7 @@ from documents.models import Documentfrom documents.models import SavedViewfrom documents.models import SavedViewFilterRulefrom documents.serialisers import DocumentSerializer-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass DocumentWrapper:diff --git a/src/documents/tests/test_api_objects.py b/src/documents/tests/test_api_objects.pyindex 46d1da5c0..69264548e 100644--- a/src/documents/tests/test_api_objects.py+++ b/src/documents/tests/test_api_objects.py@@ -21,7 +21,7 @@ from documents.models import Documentfrom documents.models import DocumentTypefrom documents.models import StoragePathfrom documents.models import Tag-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestApiObjects(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_permissions.py b/src/documents/tests/test_api_permissions.pyindex 0b2c491a4..867cdefaa 100644--- a/src/documents/tests/test_api_permissions.py+++ b/src/documents/tests/test_api_permissions.py@@ -19,7 +19,7 @@ from documents.models import DocumentTypefrom documents.models import MatchingModelfrom documents.models import StoragePathfrom documents.models import Tag-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestApiAuth(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_profile.py b/src/documents/tests/test_api_profile.pyindex d642f52d8..7422e5426 100644--- a/src/documents/tests/test_api_profile.py+++ b/src/documents/tests/test_api_profile.py@@ -8,7 +8,7 @@ from rest_framework import statusfrom rest_framework.authtoken.models import Tokenfrom rest_framework.test import APITestCase-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixin# see allauth.socialaccount.providers.openid.provider.OpenIDProviderdiff --git a/src/documents/tests/test_api_search.py b/src/documents/tests/test_api_search.pyindex bb2dd6b91..18bcefc95 100644--- a/src/documents/tests/test_api_search.py+++ b/src/documents/tests/test_api_search.py@@ -27,9 +27,9 @@ from documents.models import Tagfrom documents.models import Workflowfrom documents.search import get_backendfrom documents.search import reset_backend-from documents.tests.utils import DirectoriesMixinfrom paperless_mail.models import MailAccountfrom paperless_mail.models import MailRule+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import DocumentFactorypytestmark = pytest.mark.searchdiff --git a/src/documents/tests/test_api_trash.py b/src/documents/tests/test_api_trash.pyindex 58c4ad295..052a7f76d 100644--- a/src/documents/tests/test_api_trash.py+++ b/src/documents/tests/test_api_trash.py@@ -7,7 +7,7 @@ from rest_framework import statusfrom rest_framework.test import APITestCasefrom documents.models import Document-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestTrashAPI(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_uisettings.py b/src/documents/tests/test_api_uisettings.pyindex 82ee5d0fa..e365ea0e0 100644--- a/src/documents/tests/test_api_uisettings.py+++ b/src/documents/tests/test_api_uisettings.py@@ -6,8 +6,8 @@ from django.test import override_settingsfrom rest_framework import statusfrom rest_framework.test import APITestCase-from documents.tests.utils import DirectoriesMixinfrom paperless.version import __full_version_str__+from paperless_testing.dirs import DirectoriesMixinclass TestApiUiSettings(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_api_workflows.py b/src/documents/tests/test_api_workflows.pyindex 7c1b9b6c5..3dc08c32f 100644--- a/src/documents/tests/test_api_workflows.py+++ b/src/documents/tests/test_api_workflows.py@@ -14,7 +14,7 @@ from documents.models import Tagfrom documents.models import Workflowfrom documents.models import WorkflowActionfrom documents.models import WorkflowTrigger-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestApiWorkflows(DirectoriesMixin, APITestCase):diff --git a/src/documents/tests/test_barcodes.py b/src/documents/tests/test_barcodes.pyindex 84abcf2b1..2ad4868d8 100644--- a/src/documents/tests/test_barcodes.py+++ b/src/documents/tests/test_barcodes.py@@ -18,11 +18,11 @@ from documents.models import Documentfrom documents.models import Tagfrom documents.plugins.base import StopConsumeTaskErrorfrom documents.tests.utils import ConsumeTaskMixin-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import DummyProgressManagerfrom documents.tests.utils import FileSystemAssertsMixinfrom documents.tests.utils import SampleDirMixinfrom paperless.models import ApplicationConfiguration+from paperless_testing.dirs import DirectoriesMixinclass GetReaderPluginMixin:diff --git a/src/documents/tests/test_bulk_edit.py b/src/documents/tests/test_bulk_edit.pyindex bfd134516..1970511cc 100644--- a/src/documents/tests/test_bulk_edit.py+++ b/src/documents/tests/test_bulk_edit.py@@ -23,7 +23,7 @@ from documents.models import DocumentTypefrom documents.models import StoragePathfrom documents.models import Tagfrom documents.permissions import set_permissions_for_objects-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestBulkEdit(DirectoriesMixin, TestCase):diff --git a/src/documents/tests/test_classifier.py b/src/documents/tests/test_classifier.pyindex 827247ac4..cb8049ce8 100644--- a/src/documents/tests/test_classifier.py+++ b/src/documents/tests/test_classifier.py@@ -28,10 +28,10 @@ from documents.models import DocumentTypefrom documents.models import MatchingModelfrom documents.models import StoragePathfrom documents.models import Tag-from documents.tests.utils import DirectoriesMixinfrom paperless.settings import CLASSIFIER_LANGUAGESfrom paperless.signed_pickle import HMAC_SIZEfrom paperless.signed_pickle import signed_pickle_dumps+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import DocumentFactoryfrom paperless_testing.factories import TagFactorydiff --git a/src/documents/tests/test_consumer.py b/src/documents/tests/test_consumer.pyindex 7c98f3552..91c7701f4 100644--- a/src/documents/tests/test_consumer.py+++ b/src/documents/tests/test_consumer.py@@ -30,11 +30,11 @@ from documents.models import Tagfrom documents.parsers import ParseErrorfrom documents.plugins.helpers import ProgressStatusOptionsfrom documents.tasks import sanity_check-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import DummyProgressManagerfrom documents.tests.utils import FileSystemAssertsMixinfrom documents.tests.utils import GetConsumerMixinfrom paperless_mail.models import MailRule+from paperless_testing.dirs import DirectoriesMixinclass _BaseNewStyleParser:diff --git a/src/documents/tests/test_double_sided.py b/src/documents/tests/test_double_sided.pyindex 1189512df..3f6ecb2f1 100644--- a/src/documents/tests/test_double_sided.py+++ b/src/documents/tests/test_double_sided.py@@ -15,9 +15,9 @@ from documents.data_models import ConsumableDocumentfrom documents.data_models import DocumentSourcefrom documents.double_sided import STAGING_FILE_NAMEfrom documents.double_sided import TIMEOUT_MINUTES-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import DummyProgressManagerfrom documents.tests.utils import FileSystemAssertsMixin+from paperless_testing.dirs import DirectoriesMixin@override_settings(@@ -29,8 +29,8 @@ class TestDoubleSided(DirectoriesMixin, FileSystemAssertsMixin, TestCase):def setUp(self) -> None:super().setUp()- self.dirs.double_sided_dir = self.dirs.consumption_dir / "double-sided"- self.dirs.double_sided_dir.mkdir()+ self.double_sided_dir = self.dirs.consumption_dir / "double-sided"+ self.double_sided_dir.mkdir()self.staging_file = self.dirs.scratch_dir / STAGING_FILE_NAMEdef consume_file(self, srcname, dstname: str | Path = "foo.pdf"):@@ -39,7 +39,7 @@ class TestDoubleSided(DirectoriesMixin, FileSystemAssertsMixin, TestCase):destination file does not exist afterwards"""src = self.SAMPLE_DIR / srcname- dst = self.dirs.double_sided_dir / dstname+ dst = self.double_sided_dir / dstnamedst.parent.mkdir(parents=True, exist_ok=True)shutil.copy(src, dst)with mock.patch(@@ -214,31 +214,41 @@ class TestDoubleSided(DirectoriesMixin, FileSystemAssertsMixin, TestCase):self.assertIsNotFile(self.staging_file)self.assertIsInstance(msg.get("document_id"), int)- def test_subdirectory_upload(self) -> None:+ def test_consume_double_sided_in_nested_dir(self) -> None:"""GIVEN:- A staging file existsWHEN:- - A file gets uploaded into foo/bar/double-sided- or double-sided/foo/bar+ - A file is uploaded into foo/bar/double-sidedTHEN:- - The collated file gets put into foo/bar- """- # TODO: parameterize this instead- for path in [- Path("foo") / "bar" / "double-sided",- Path("double-sided") / "foo" / "bar",- ]:- with self.subTest(path=str(path)):- # Ensure we get fresh directories for each run- self.tearDown()- self.setUp()-- self.create_staging_file()- self.consume_file("double-sided-odd.pdf", Path(path) / "foo.pdf")- self.assertIsFile(- self.dirs.consumption_dir / "foo" / "bar" / "foo-collated.pdf",- )+ - The collated file is placed into foo/bar+ """+ self.create_staging_file()+ self.consume_file(+ "double-sided-odd.pdf",+ Path("foo") / "bar" / "double-sided" / "foo.pdf",+ )+ self.assertIsFile(+ self.dirs.consumption_dir / "foo" / "bar" / "foo-collated.pdf",+ )++ def test_consume_double_sided_with_nested_subdir(self) -> None:+ """+ GIVEN:+ - A staging file exists+ WHEN:+ - A file is uploaded into double-sided/foo/bar+ THEN:+ - The collated file is placed into foo/bar+ """+ self.create_staging_file()+ self.consume_file(+ "double-sided-odd.pdf",+ Path("double-sided") / "foo" / "bar" / "foo.pdf",+ )+ self.assertIsFile(+ self.dirs.consumption_dir / "foo" / "bar" / "foo-collated.pdf",+ )@override_settings(CONSUMER_ENABLE_COLLATE_DOUBLE_SIDED=False)def test_disabled_double_sided_dir_upload(self) -> None:diff --git a/src/documents/tests/test_file_handling.py b/src/documents/tests/test_file_handling.pyindex 66d6f3c85..0e8434645 100644--- a/src/documents/tests/test_file_handling.py+++ b/src/documents/tests/test_file_handling.py@@ -30,8 +30,8 @@ from documents.models import DocumentTypefrom documents.models import StoragePathfrom documents.serialisers import DocumentSerializerfrom documents.tasks import empty_trash-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixin+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import DocumentFactorydiff --git a/src/documents/tests/test_management.py b/src/documents/tests/test_management.pyindex aa6befb9b..27375ecee 100644--- a/src/documents/tests/test_management.py+++ b/src/documents/tests/test_management.py@@ -20,8 +20,8 @@ if TYPE_CHECKING:from documents.file_handling import generate_filenamefrom documents.models import Documentfrom documents.tasks import update_document_content_maybe_archive_file-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixin+from paperless_testing.dirs import DirectoriesMixinsample_file: Path = Path(__file__).parent / "samples" / "simple.pdf"diff --git a/src/documents/tests/test_management_exporter.py b/src/documents/tests/test_management_exporter.pyindex f85a8c4bf..95dbfc429 100644--- a/src/documents/tests/test_management_exporter.py+++ b/src/documents/tests/test_management_exporter.py@@ -46,10 +46,10 @@ from documents.models import WorkflowTriggerfrom documents.sanity_checker import check_sanityfrom documents.settings import EXPORTER_FILE_NAMEfrom documents.settings import EXPORTER_SHARE_LINK_BUNDLE_NAME-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixinfrom documents.tests.utils import SampleDirMixinfrom paperless_mail.models import MailAccount+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.dirs import paperless_environmentdiff --git a/src/documents/tests/test_management_importer.py b/src/documents/tests/test_management_importer.pyindex bd74e7a16..a965a1037 100644--- a/src/documents/tests/test_management_importer.py+++ b/src/documents/tests/test_management_importer.py@@ -15,9 +15,9 @@ from documents.management.commands.document_importer import _deserialize_recordfrom documents.models import Documentfrom documents.settings import EXPORTER_ARCHIVE_NAMEfrom documents.settings import EXPORTER_FILE_NAME-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixinfrom documents.tests.utils import SampleDirMixin+from paperless_testing.dirs import DirectoriesMixin@pytest.mark.managementdiff --git a/src/documents/tests/test_management_retagger.py b/src/documents/tests/test_management_retagger.pyindex 23be6e2f2..d909946a8 100644--- a/src/documents/tests/test_management_retagger.py+++ b/src/documents/tests/test_management_retagger.py@@ -14,7 +14,7 @@ from documents.models import DocumentTypefrom documents.models import MatchingModelfrom documents.models import StoragePathfrom documents.models import Tag-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import CorrespondentFactoryfrom paperless_testing.factories import DocumentFactoryfrom paperless_testing.factories import DocumentTypeFactorydiff --git a/src/documents/tests/test_management_superuser.py b/src/documents/tests/test_management_superuser.pyindex f2741ba53..620f46aef 100644--- a/src/documents/tests/test_management_superuser.py+++ b/src/documents/tests/test_management_superuser.py@@ -7,7 +7,7 @@ from django.contrib.auth.models import Userfrom django.core.management import call_commandfrom django.test import TestCase-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixin@pytest.mark.managementdiff --git a/src/documents/tests/test_management_thumbnails.py b/src/documents/tests/test_management_thumbnails.pyindex 0b016f0cd..c72dd1b5e 100644--- a/src/documents/tests/test_management_thumbnails.py+++ b/src/documents/tests/test_management_thumbnails.py@@ -9,8 +9,8 @@ from django.test import TestCasefrom documents.management.commands.document_thumbnails import _process_documentfrom documents.models import Documentfrom documents.parsers import get_default_thumbnail-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixin+from paperless_testing.dirs import DirectoriesMixin@pytest.mark.managementdiff --git a/src/documents/tests/test_share_link_bundles.py b/src/documents/tests/test_share_link_bundles.pyindex b86406924..ce57a0b32 100644--- a/src/documents/tests/test_share_link_bundles.py+++ b/src/documents/tests/test_share_link_bundles.py@@ -20,7 +20,7 @@ from documents.models import ShareLinkBundlefrom documents.serialisers import ShareLinkBundleSerializerfrom documents.tasks import build_share_link_bundlefrom documents.tasks import cleanup_expired_share_link_bundles-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import DocumentFactorydiff --git a/src/documents/tests/test_tag_hierarchy.py b/src/documents/tests/test_tag_hierarchy.pyindex ed0bff351..2b678010f 100644--- a/src/documents/tests/test_tag_hierarchy.py+++ b/src/documents/tests/test_tag_hierarchy.py@@ -13,7 +13,7 @@ from documents.models import WorkflowActionfrom documents.models import WorkflowTriggerfrom documents.serialisers import TagSerializerfrom documents.signals.handlers import run_workflows-from documents.tests.utils import DirectoriesMixin+from paperless_testing.dirs import DirectoriesMixinclass TestTagHierarchyPermissions(APITestCase):diff --git a/src/documents/tests/test_tasks.py b/src/documents/tests/test_tasks.pyindex 107c1dc6b..778ab1855 100644--- a/src/documents/tests/test_tasks.py+++ b/src/documents/tests/test_tasks.py@@ -18,8 +18,8 @@ from documents.models import WorkflowActionfrom documents.sanity_checker import SanityCheckFailedExceptionfrom documents.sanity_checker import SanityCheckMessagesfrom documents.tests.test_classifier import dummy_preprocess-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixin+from paperless_testing.dirs import DirectoriesMixin@pytest.mark.django_dbdiff --git a/src/documents/tests/test_version_conditionals.py b/src/documents/tests/test_version_conditionals.pyindex a2531c7e6..af22c1124 100644--- a/src/documents/tests/test_version_conditionals.py+++ b/src/documents/tests/test_version_conditionals.py@@ -14,8 +14,8 @@ from documents.conditionals import preview_etagfrom documents.conditionals import thumbnail_etagfrom documents.conditionals import thumbnail_last_modifiedfrom documents.models import Document-from documents.tests.utils import DirectoriesMixinfrom documents.versioning import resolve_effective_document_by_pk+from paperless_testing.dirs import DirectoriesMixinif TYPE_CHECKING:from rest_framework.request import Requestdiff --git a/src/documents/tests/test_views.py b/src/documents/tests/test_views.pyindex ce0024db9..97dc6f66d 100644--- a/src/documents/tests/test_views.py+++ b/src/documents/tests/test_views.py@@ -29,11 +29,11 @@ from documents.models import StoragePathfrom documents.models import Tagfrom documents.models import UiSettingsfrom documents.signals.handlers import update_llm_suggestions_cache-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import read_streaming_responsefrom paperless.models import ApplicationConfigurationfrom paperless_ai.exceptions import LLMProviderErrorfrom paperless_ai.exceptions import LLMTimeoutError+from paperless_testing.dirs import DirectoriesMixinclass TestViews(DirectoriesMixin, TestCase):diff --git a/src/documents/tests/test_workflows.py b/src/documents/tests/test_workflows.pyindex 8f241e289..f79383323 100644--- a/src/documents/tests/test_workflows.py+++ b/src/documents/tests/test_workflows.py@@ -64,13 +64,13 @@ from documents.models import WorkflowTriggerfrom documents.plugins.base import StopConsumeTaskErrorfrom documents.serialisers import WorkflowTriggerSerializerfrom documents.signals import document_consumption_finished-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import DummyProgressManagerfrom documents.tests.utils import FileSystemAssertsMixinfrom documents.tests.utils import SampleDirMixinfrom documents.workflows.actions import execute_password_removal_actionfrom paperless_mail.models import MailAccountfrom paperless_mail.models import MailRule+from paperless_testing.dirs import DirectoriesMixinclass TestWorkflows(diff --git a/src/documents/tests/utils.py b/src/documents/tests/utils.pyindex 16bc16f3d..27c139d03 100644--- a/src/documents/tests/utils.py+++ b/src/documents/tests/utils.py@@ -1,8 +1,5 @@-import shutil-import tempfileimport timeimport warnings-from collections import namedtuplefrom collections.abc import Callablefrom collections.abc import Generatorfrom collections.abc import Iterator@@ -19,7 +16,6 @@ from django.db import connectionfrom django.db.migrations.executor import MigrationExecutorfrom django.http import StreamingHttpResponsefrom django.test import TransactionTestCase-from django.test import override_settingsfrom documents.consumer import AsnCheckPluginfrom documents.consumer import ConsumerPlugin@@ -31,54 +27,6 @@ from documents.parsers import ParseErrorfrom documents.plugins.helpers import ProgressStatusOptions-def setup_directories():- dirs = namedtuple("Dirs", ())-- dirs.data_dir = Path(tempfile.mkdtemp()).resolve()- dirs.scratch_dir = Path(tempfile.mkdtemp()).resolve()- dirs.media_dir = Path(tempfile.mkdtemp()).resolve()- dirs.consumption_dir = Path(tempfile.mkdtemp()).resolve()- dirs.static_dir = Path(tempfile.mkdtemp()).resolve()- dirs.index_dir = dirs.data_dir / "index"- dirs.originals_dir = dirs.media_dir / "documents" / "originals"- dirs.thumbnail_dir = dirs.media_dir / "documents" / "thumbnails"- dirs.archive_dir = dirs.media_dir / "documents" / "archive"- dirs.logging_dir = dirs.data_dir / "log"-- dirs.index_dir.mkdir(parents=True, exist_ok=True)- dirs.originals_dir.mkdir(parents=True, exist_ok=True)- dirs.thumbnail_dir.mkdir(parents=True, exist_ok=True)- dirs.archive_dir.mkdir(parents=True, exist_ok=True)- dirs.logging_dir.mkdir(parents=True, exist_ok=True)-- dirs.settings_override = override_settings(- DATA_DIR=dirs.data_dir,- SCRATCH_DIR=dirs.scratch_dir,- MEDIA_ROOT=dirs.media_dir,- ORIGINALS_DIR=dirs.originals_dir,- THUMBNAIL_DIR=dirs.thumbnail_dir,- ARCHIVE_DIR=dirs.archive_dir,- CONSUMPTION_DIR=dirs.consumption_dir,- LOGGING_DIR=dirs.logging_dir,- INDEX_DIR=dirs.index_dir,- STATIC_ROOT=dirs.static_dir,- MODEL_FILE=dirs.data_dir / "classification_model.pickle",- MEDIA_LOCK=dirs.media_dir / "media.lock",- )- dirs.settings_override.enable()-- return dirs---def remove_dirs(dirs) -> None:- shutil.rmtree(dirs.media_dir, ignore_errors=True)- shutil.rmtree(dirs.data_dir, ignore_errors=True)- shutil.rmtree(dirs.scratch_dir, ignore_errors=True)- shutil.rmtree(dirs.consumption_dir, ignore_errors=True)- shutil.rmtree(dirs.static_dir, ignore_errors=True)- dirs.settings_override.disable()--def util_call_with_backoff(method_or_callable: Callable,args: list | tuple,@@ -147,27 +95,6 @@ def read_streaming_response(response: StreamingHttpResponse) -> bytes:return content-class DirectoriesMixin:- """- Creates and overrides settings for all folders and paths, then ensures- they are cleaned up on exit- """-- def setUp(self) -> None:- from documents.search import reset_backend-- reset_backend()- self.dirs = setup_directories()- super().setUp()-- def tearDown(self) -> None:- from documents.search import reset_backend-- super().tearDown()- reset_backend()- remove_dirs(self.dirs)--class FileSystemAssertsMixin:"""Utilities for checks various state information of the file systemdiff --git a/src/paperless/tests/parsers/test_tesseract_custom_settings.py b/src/paperless/tests/parsers/test_tesseract_custom_settings.pyindex d39c9dabf..ad0dc677f 100644--- a/src/paperless/tests/parsers/test_tesseract_custom_settings.py+++ b/src/paperless/tests/parsers/test_tesseract_custom_settings.py@@ -3,7 +3,6 @@ import jsonfrom django.test import TestCasefrom django.test import override_settings-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixinfrom paperless.models import ApplicationConfigurationfrom paperless.models import CleanChoices@@ -11,6 +10,7 @@ from paperless.models import ColorConvertChoicesfrom paperless.models import ModeChoicesfrom paperless.models import OutputTypeChoicesfrom paperless.parsers.tesseract import RasterisedDocumentParser+from paperless_testing.dirs import DirectoriesMixinclass TestParserSettingsFromDb(DirectoriesMixin, FileSystemAssertsMixin, TestCase):diff --git a/src/paperless/tests/settings/test_remote_user.py b/src/paperless/tests/settings/test_remote_user.pyindex f98097d03..cc8b507c6 100644--- a/src/paperless/tests/settings/test_remote_user.py+++ b/src/paperless/tests/settings/test_remote_user.py@@ -7,8 +7,8 @@ from django.test import override_settingsfrom rest_framework import statusfrom rest_framework.test import APITestCase-from documents.tests.utils import DirectoriesMixinfrom paperless.settings import _parse_remote_user_settings+from paperless_testing.dirs import DirectoriesMixinclass TestRemoteUser(DirectoriesMixin, APITestCase):diff --git a/src/paperless_mail/tests/test_api.py b/src/paperless_mail/tests/test_api.pyindex f96b1cbc2..a6c3c81bb 100644--- a/src/paperless_mail/tests/test_api.py+++ b/src/paperless_mail/tests/test_api.py@@ -7,7 +7,6 @@ from guardian.shortcuts import assign_permfrom rest_framework import statusfrom rest_framework.test import APITestCase-from documents.tests.utils import DirectoriesMixinfrom paperless_mail.models import MailAccountfrom paperless_mail.models import MailRulefrom paperless_mail.models import ProcessedMail@@ -15,6 +14,7 @@ from paperless_mail.tests.factories import MailAccountFactoryfrom paperless_mail.tests.factories import MailRuleFactoryfrom paperless_mail.tests.factories import ProcessedMailFactoryfrom paperless_mail.tests.test_mail import BogusMailBox+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import CorrespondentFactoryfrom paperless_testing.factories import DocumentTypeFactoryfrom paperless_testing.factories import TagFactorydiff --git a/src/paperless_mail/tests/test_mail.py b/src/paperless_mail/tests/test_mail.pyindex 609ac8947..3dca9fc7c 100644--- a/src/paperless_mail/tests/test_mail.py+++ b/src/paperless_mail/tests/test_mail.py@@ -28,7 +28,6 @@ from rest_framework.test import APITestCasefrom documents.models import Correspondentfrom documents.models import MatchingModel-from documents.tests.utils import DirectoriesMixinfrom documents.tests.utils import FileSystemAssertsMixinfrom paperless_mail import tasksfrom paperless_mail.mail import MailAccountHandler@@ -42,6 +41,7 @@ from paperless_mail.models import MailRulefrom paperless_mail.models import ProcessedMailfrom paperless_mail.tests.factories import MailAccountFactoryfrom paperless_mail.tests.factories import MailRuleFactory+from paperless_testing.dirs import DirectoriesMixinfrom paperless_testing.factories import CorrespondentFactorydiff --git a/src/paperless_mail/tests/test_mail_nfc.py b/src/paperless_mail/tests/test_mail_nfc.pyindex bfef06da9..930c861bc 100644--- a/src/paperless_mail/tests/test_mail_nfc.py+++ b/src/paperless_mail/tests/test_mail_nfc.py@@ -13,8 +13,6 @@ from unittest import mockimport pytest-from documents.tests.utils import remove_dirs-from documents.tests.utils import setup_directoriesfrom paperless_mail.models import MailRulefrom paperless_mail.tests.factories import MailAccountFactoryfrom paperless_mail.tests.test_mail import MessageBuilder@@ -22,13 +20,6 @@ from paperless_mail.tests.test_mail import _AttachmentDeffrom paperless_mail.tests.test_mail import fake_magic_from_buffer-def directories(settings):- dirs = setup_directories()- yield dirs- remove_dirs(dirs)--@pytest.fixture()def queue_consumption_tasks_mock():with mock.patch("paperless_mail.mail.queue_consumption_tasks") as m:@@ -78,7 +69,7 @@ class TestMailNFCNormalization:def test_attachment_nfd_filename_normalized_to_nfc(self,- directories,+ paperless_dirs,queue_consumption_tasks_mock,attachment_rule,mail_account_handler,@@ -123,7 +114,7 @@ class TestMailNFCNormalization:def test_eml_subject_filename_nfc(self,- directories,+ paperless_dirs,queue_consumption_tasks_mock,eml_rule,mail_account_handler,@@ -156,7 +147,7 @@ class TestMailNFCNormalization:def test_already_nfc_attachment_filename_unchanged(self,- directories,+ paperless_dirs,queue_consumption_tasks_mock,attachment_rule,mail_account_handler,diff --git a/src/paperless_testing/dirs.py b/src/paperless_testing/dirs.pyindex 266bad307..794708ad6 100644--- a/src/paperless_testing/dirs.py+++ b/src/paperless_testing/dirs.py@@ -14,6 +14,7 @@ from tempfile import TemporaryDirectoryfrom typing import TYPE_CHECKINGfrom typing import TypedDict+import pytestfrom django.test import override_settingsif TYPE_CHECKING:@@ -129,3 +130,17 @@ def paperless_environment() -> Iterator[PaperlessDirs]:yield dirsfinally:reset_backend()+++class DirectoriesMixin:+ """Bridges the directory fixture to unittest TestCase subclasses and to+ plain pytest test classes that want `self.dirs`.++ Delete once no class depends on it.+ """++ dirs: PaperlessDirs++ @pytest.fixture(autouse=True)+ def _paperless_dirs(self, paperless_dirs: PaperlessDirs) -> None:+ self.dirs = paperless_dirs