diff --git a/src/borg/helpers/fs.py b/src/borg/helpers/fs.py index 29e4bb8e0..7e2e5efe2 100644 --- a/src/borg/helpers/fs.py +++ b/src/borg/helpers/fs.py @@ -93,7 +93,7 @@ def get_security_dir(repository_id=None, *, legacy=True): return security_dir -def get_cache_dir(*, legacy=True): +def get_cache_dir(*, legacy=False): """Determine where to repository keys and cache""" if legacy: diff --git a/src/borg/testsuite/helpers.py b/src/borg/testsuite/helpers.py index 6b1447da7..a1ae9c51c 100644 --- a/src/borg/testsuite/helpers.py +++ b/src/borg/testsuite/helpers.py @@ -646,9 +646,12 @@ def test_get_cache_dir(monkeypatch): monkeypatch.delenv("BORG_BASE_DIR", raising=False) if is_win32: monkeypatch.delenv("BORG_CACHE_DIR", raising=False) - assert get_cache_dir(legacy=False) == os.path.join( - os.path.expanduser("~"), "AppData", "Local", "borg", "borg", "Cache" - ) + assert get_cache_dir() == os.path.join(os.path.expanduser("~"), "AppData", "Local", "borg", "borg", "Cache") + elif is_darwin: + monkeypatch.delenv("BORG_CACHE_DIR", raising=False) + assert get_cache_dir() == os.path.join(os.path.expanduser("~"), "Library", "Caches", "borg") + monkeypatch.setenv("BORG_CACHE_DIR", "/var/tmp") + assert get_cache_dir() == "/var/tmp" else: monkeypatch.delenv("XDG_CACHE_HOME", raising=False) monkeypatch.delenv("BORG_CACHE_DIR", raising=False)