From 6ab424598ddd11caae16ae33a7589a75d49908b5 Mon Sep 17 00:00:00 2001 From: Thomas Waldmann Date: Sat, 4 Feb 2023 18:17:43 +0100 Subject: [PATCH] improve test_get_cache_dir --- src/borg/testsuite/helpers.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/borg/testsuite/helpers.py b/src/borg/testsuite/helpers.py index 47e38679a..f0a696a1d 100644 --- a/src/borg/testsuite/helpers.py +++ b/src/borg/testsuite/helpers.py @@ -654,18 +654,21 @@ def test_get_config_dir_compat(monkeypatch): def test_get_cache_dir(monkeypatch): """test that get_cache_dir respects environment""" monkeypatch.delenv("BORG_BASE_DIR", raising=False) + home_dir = os.path.expanduser("~") if is_win32: monkeypatch.delenv("BORG_CACHE_DIR", raising=False) - assert get_cache_dir() == os.path.join(os.path.expanduser("~"), "AppData", "Local", "borg", "borg", "Cache") + assert get_cache_dir() == os.path.join(home_dir, "AppData", "Local", "borg", "borg", "Cache") + monkeypatch.setenv("BORG_CACHE_DIR", home_dir) + assert get_cache_dir() == home_dir elif is_darwin: monkeypatch.delenv("BORG_CACHE_DIR", raising=False) - assert get_cache_dir() == os.path.join(os.path.expanduser("~"), "Library", "Caches", "borg") + assert get_cache_dir() == os.path.join(home_dir, "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) - assert get_cache_dir() == os.path.join(os.path.expanduser("~"), ".cache", "borg") + assert get_cache_dir() == os.path.join(home_dir, ".cache", "borg") monkeypatch.setenv("XDG_CACHE_HOME", "/var/tmp/.cache") assert get_cache_dir() == os.path.join("/var/tmp/.cache", "borg") monkeypatch.setenv("BORG_CACHE_DIR", "/var/tmp")