Merge pull request #8918 from ThomasWaldmann/modularize-tests

Modularize tests

Author: ThomasWaldmann

src/borg/conftest.py

@@ -14,7 +14,7 @@
 from borg.testsuite import has_lchflags, has_llfuse, has_pyfuse3  # noqa: E402
 from borg.testsuite import are_symlinks_supported, are_hardlinks_supported, is_utime_fully_supported  # noqa: E402
 from borg.testsuite.archiver import BORG_EXES
-from borg.testsuite.platform_test import fakeroot_detected  # noqa: E402
+from borg.testsuite.platform.platform_test import fakeroot_detected  # noqa: E402
 
 
 @pytest.fixture(autouse=True)

src/borg/selftest.py

@@ -21,7 +21,7 @@
 import time
 from unittest import TestResult, TestSuite, defaultTestLoader
 
-from .testsuite.crypto_test import CryptoTestCase
+from .testsuite.crypto.crypto_test import CryptoTestCase
 from .testsuite.chunkers.buzhash_self_test import ChunkerTestCase
 from .testsuite.chunkers.fixed_self_test import ChunkerFixedTestCase
 

src/borg/testsuite/archiver/__init__.py

@@ -29,7 +29,7 @@
 from .. import has_lchflags, is_utime_fully_supported, have_fuse_mtime_ns, st_mtime_ns_round, no_selinux
 from .. import changedir
 from .. import are_symlinks_supported, are_hardlinks_supported, are_fifos_supported
-from ..platform_test import is_win32
+from ..platform.platform_test import is_win32
 from ...xattr import get_all
 
 RK_ENCRYPTION = "--encryption=repokey-aes-ocb"

src/borg/testsuite/archiver/key_cmds_test.py

@@ -10,7 +10,7 @@
 from ...helpers import bin_to_hex, hex_to_bin
 from ...helpers import msgpack
 from ...repository import Repository
-from ..key_test import TestKey
+from ..crypto.key_test import TestKey
 from . import RK_ENCRYPTION, KF_ENCRYPTION, cmd, _extract_repository_id, _set_repository_id, generate_archiver_tests
 
 pytest_generate_tests = lambda metafunc: generate_archiver_tests(metafunc, kinds="local,remote,binary")  # NOQA

src/borg/testsuite/archiver/mount_cmds_test.py

@@ -12,7 +12,7 @@
 from .. import has_lchflags, llfuse
 from .. import changedir, no_selinux, same_ts_ns
 from .. import are_symlinks_supported, are_hardlinks_supported, are_fifos_supported
-from ..platform_test import fakeroot_detected
+from ..platform.platform_test import fakeroot_detected
 from . import RK_ENCRYPTION, cmd, assert_dirs_equal, create_regular_file, create_src_archive, open_archive, src_file
 from . import requires_hardlinks, _extract_hardlinks_setup, fuse_mount, create_test_files, generate_archiver_tests
 

src/borg/testsuite/archiver/transfer_cmd_test.py

@@ -13,7 +13,7 @@
 from ...helpers import open_item
 from ...helpers.time import parse_timestamp
 from ...helpers.parseformat import parse_file_size, ChunkerParams
-from ..platform_test import is_win32
+from ..platform.platform_test import is_win32
 from . import cmd, create_regular_file, create_test_files, RK_ENCRYPTION, open_archive, generate_archiver_tests
 
 pytest_generate_tests = lambda metafunc: generate_archiver_tests(metafunc, kinds="local,remote")  # NOQA

src/borg/testsuite/cache_test.py

@@ -3,7 +3,7 @@
 import pytest
 
 from .hashindex_test import H
-from .key_test import TestKey
+from .crypto.key_test import TestKey
 from ..archive import Statistics
 from ..cache import AdHocWithFilesCache
 from ..crypto.key import AESOCBRepoKey

src/borg/testsuite/crypto/__init__.py

@@ -4,14 +4,14 @@
 from unittest.mock import MagicMock
 import unittest
 
-from ..crypto.low_level import AES256_CTR_HMAC_SHA256, AES256_OCB, CHACHA20_POLY1305, UNENCRYPTED, IntegrityError
-from ..crypto.low_level import bytes_to_long, bytes_to_int, long_to_bytes
-from ..crypto.low_level import AES, hmac_sha256
+from ...crypto.low_level import AES256_CTR_HMAC_SHA256, AES256_OCB, CHACHA20_POLY1305, UNENCRYPTED, IntegrityError
+from ...crypto.low_level import bytes_to_long, bytes_to_int, long_to_bytes
+from ...crypto.low_level import AES, hmac_sha256
 from hashlib import sha256
-from ..crypto.key import CHPOKeyfileKey, AESOCBRepoKey, FlexiKey, KeyBase, PlaintextKey
-from ..helpers import msgpack, bin_to_hex
+from ...crypto.key import CHPOKeyfileKey, AESOCBRepoKey, FlexiKey, KeyBase, PlaintextKey
+from ...helpers import msgpack, bin_to_hex
 
-from . import BaseTestCase
+from .. import BaseTestCase
 
 
 class CryptoTestCase(BaseTestCase):

src/borg/testsuite/crypto_test.py src/borg/testsuite/crypto/crypto_test.pysrc/borg/testsuite/crypto_test.py renamed to src/borg/testsuite/crypto/crypto_test.py

@@ -1,6 +1,6 @@
 import pytest
 
-from ..crypto.file_integrity import DetachedIntegrityCheckedFile, FileIntegrityError
+from ...crypto.file_integrity import DetachedIntegrityCheckedFile, FileIntegrityError
 
 
 class TestReadIntegrityFile: