Parcourir la source

improve fs_test

Thomas Waldmann il y a 1 jour
Parent
commit
dcdc91c1cc
2 fichiers modifiés avec 3 ajouts et 3 suppressions
  1. 1 1
      src/borg/platform/__init__.py
  2. 2 2
      src/borg/testsuite/helpers/fs_test.py

+ 1 - 1
src/borg/platform/__init__.py

@@ -6,7 +6,7 @@ Public APIs are documented in platform.base.
 
 from types import ModuleType
 
-from ..platformflags import is_win32, is_linux, is_freebsd, is_netbsd, is_darwin, is_cygwin
+from ..platformflags import is_win32, is_linux, is_freebsd, is_netbsd, is_darwin, is_cygwin, is_haiku
 
 from .base import ENOATTR, API_VERSION
 from .base import SaveFile, sync_dir, fdatasync, safe_fadvise

+ 2 - 2
src/borg/testsuite/helpers/fs_test.py

@@ -21,7 +21,7 @@ from ...helpers.fs import (
     remove_dotdot_prefixes,
     make_path_safe,
 )
-from ...platform import is_win32, is_darwin
+from ...platform import is_win32, is_darwin, is_haiku
 from .. import are_hardlinks_supported
 from .. import rejected_dotdot_paths
 
@@ -33,7 +33,7 @@ def test_get_base_dir(monkeypatch):
     monkeypatch.delenv("USER", raising=False)
     assert get_base_dir(legacy=True) == os.path.expanduser("~")
     # Haiku OS is a single-user OS, expanding "~root" is not supported.
-    if not sys.platform.startswith("haiku"):
+    if not is_haiku:
         monkeypatch.setenv("USER", "root")
         assert get_base_dir(legacy=True) == os.path.expanduser("~root")
     monkeypatch.setenv("HOME", "/var/tmp/home")