mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-23 00:07:38 +00:00
Code Issues Releases Wiki Activity

point XDG_*_HOME to temp dirs for tests, fixes #1714

Browse source 
otherwise it spoils the user's nonces and cache dirs with lots of files.

also: remove all BORG_* env vars from the outer environment

fix get_*_dir tests to use monkeypatch.
This commit is contained in:
Thomas Waldmann 2016-10-14 00:46:43 +02:00
parent dda439be57
commit f3efcdbd2e
2 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
borg/testsuite/helpers.py
View file

@ -617,38 +617,24 @@ def test(self):
self.assert_equal(parse_timestamp('2015-04-19T20:25:00'), datetime(2015, 4, 19, 20, 25, 0, 0, timezone.utc)) self.assert_equal(parse_timestamp('2015-04-19T20:25:00'), datetime(2015, 4, 19, 20, 25, 0, 0, timezone.utc))
def test_get_cache_dir(): def test_get_cache_dir(monkeypatch):
"""test that get_cache_dir respects environment""" """test that get_cache_dir respects environment"""
# reset BORG_CACHE_DIR in order to test default monkeypatch.delenv('XDG_CACHE_HOME', raising=False)
old_env = None
if os.environ.get('BORG_CACHE_DIR'):
old_env = os.environ['BORG_CACHE_DIR']
del(os.environ['BORG_CACHE_DIR'])
assert get_cache_dir() == os.path.join(os.path.expanduser('~'), '.cache', 'borg') assert get_cache_dir() == os.path.join(os.path.expanduser('~'), '.cache', 'borg')
os.environ['XDG_CACHE_HOME'] = '/var/tmp/.cache' monkeypatch.setenv('XDG_CACHE_HOME', '/var/tmp/.cache')
assert get_cache_dir() == os.path.join('/var/tmp/.cache', 'borg') assert get_cache_dir() == os.path.join('/var/tmp/.cache', 'borg')
os.environ['BORG_CACHE_DIR'] = '/var/tmp' monkeypatch.setenv('BORG_CACHE_DIR', '/var/tmp')
assert get_cache_dir() == '/var/tmp' assert get_cache_dir() == '/var/tmp'
# reset old env
if old_env is not None:
os.environ['BORG_CACHE_DIR'] = old_env
def test_get_keys_dir(): def test_get_keys_dir(monkeypatch):
"""test that get_keys_dir respects environment""" """test that get_keys_dir respects environment"""
# reset BORG_KEYS_DIR in order to test default monkeypatch.delenv('XDG_CONFIG_HOME', raising=False)
old_env = None
if os.environ.get('BORG_KEYS_DIR'):
old_env = os.environ['BORG_KEYS_DIR']
del(os.environ['BORG_KEYS_DIR'])
assert get_keys_dir() == os.path.join(os.path.expanduser('~'), '.config', 'borg', 'keys') assert get_keys_dir() == os.path.join(os.path.expanduser('~'), '.config', 'borg', 'keys')
os.environ['XDG_CONFIG_HOME'] = '/var/tmp/.config' monkeypatch.setenv('XDG_CONFIG_HOME', '/var/tmp/.config')
assert get_keys_dir() == os.path.join('/var/tmp/.config', 'borg', 'keys') assert get_keys_dir() == os.path.join('/var/tmp/.config', 'borg', 'keys')
os.environ['BORG_KEYS_DIR'] = '/var/tmp' monkeypatch.setenv('BORG_KEYS_DIR', '/var/tmp')
assert get_keys_dir() == '/var/tmp' assert get_keys_dir() == '/var/tmp'
# reset old env
if old_env is not None:
os.environ['BORG_KEYS_DIR'] = old_env
@pytest.fixture() @pytest.fixture()

14
conftest.py Normal file
View file

@ -0,0 +1,14 @@
import os
import pytest
@pytest.fixture(autouse=True)
def clean_env(tmpdir_factory, monkeypatch):
# avoid that we access / modify the user's normal .config / .cache directory:
monkeypatch.setenv('XDG_CONFIG_HOME', tmpdir_factory.mktemp('xdg-config-home'))
monkeypatch.setenv('XDG_CACHE_HOME', tmpdir_factory.mktemp('xdg-cache-home'))
# also avoid to use anything from the outside environment:
keys = [key for key in os.environ if key.startswith('BORG_')]
for key in keys:
monkeypatch.delenv(key, raising=False)