refactor platform tests into a package

src/borg/conftest.py

@@ -14,7 +14,7 @@ from borg.archiver import Archiver  # noqa: E402
 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/testsuite/archiver/__init__.py

@@ -29,7 +29,7 @@ from ...repository import Repository
 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/mount_cmds_test.py

@@ -12,7 +12,7 @@ from ...helpers import flags_noatime, flags_normal
 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 ...constants import *  # NOQA
 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/platform_darwin_test.py → src/borg/testsuite/platform/darwin_test.py

@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-from ..platform import acl_get, acl_set
+from ...platform import acl_get, acl_set
 from .platform_test import skipif_not_darwin, skipif_fakeroot_detected, skipif_acls_not_working
 
 # set module-level skips

src/borg/testsuite/platform_freebsd_test.py → src/borg/testsuite/platform/freebsd_test.py

@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-from ..platform import acl_get, acl_set
+from ...platform import acl_get, acl_set
 from .platform_test import skipif_not_freebsd, skipif_acls_not_working
 
 # set module-level skips

src/borg/testsuite/platform_linux_test.py → src/borg/testsuite/platform/linux_test.py

@@ -1,7 +1,7 @@
 import os
 import tempfile
 
-from ..platform import acl_get, acl_set
+from ...platform import acl_get, acl_set
 from .platform_test import skipif_not_linux, skipif_fakeroot_detected, skipif_acls_not_working, skipif_no_ubel_user
 
 # set module-level skips
@@ -116,7 +116,7 @@ def test_non_ascii_acl():
 
 
 def test_utils():
-    from ..platform.linux import acl_use_local_uid_gid
+    from ...platform.linux import acl_use_local_uid_gid
 
     assert acl_use_local_uid_gid(b"user:nonexistent1234:rw-:1234") == b"user:1234:rw-"
     assert acl_use_local_uid_gid(b"group:nonexistent1234:rw-:1234") == b"group:1234:rw-"

src/borg/testsuite/platform_test.py → src/borg/testsuite/platform/platform_test.py

@@ -4,11 +4,11 @@ import os
 
 import pytest
 
-from ..platformflags import is_darwin, is_freebsd, is_linux, is_win32
-from ..platform import acl_get, acl_set
-from ..platform import get_process_id, process_alive
-from . import unopened_tempfile
-from .fslocking_test import free_pid  # NOQA
+from ...platformflags import is_darwin, is_freebsd, is_linux, is_win32
+from ...platform import acl_get, acl_set
+from ...platform import get_process_id, process_alive
+from .. import unopened_tempfile
+from ..fslocking_test import free_pid  # NOQA
 
 
 def fakeroot_detected():
@@ -77,7 +77,7 @@ skipif_acls_not_working = pytest.mark.skipif(not are_acls_working(), reason="ACL
 skipif_no_ubel_user = pytest.mark.skipif(not user_exists("übel"), reason="requires übel user")
 
 
-def test_process_alive(free_pid):
+def test_process_alive(free_pid):  # NOQA
     id = get_process_id()
     assert process_alive(*id)
     host, pid, tid = id

src/borg/testsuite/platform_posix_test.py → src/borg/testsuite/platform/posix_test.py

@@ -1,4 +1,4 @@
-from ..platform import swidth
+from ...platform import swidth
 from .platform_test import skipif_not_posix