mirror of https://github.com/borgbackup/borg.git
Merge branch '1.0-maint' into merge-1.0-maint
This commit is contained in:
commit
775440fdcc
|
@ -14,13 +14,13 @@ from .archiver import changedir, cmd
|
||||||
|
|
||||||
|
|
||||||
@pytest.yield_fixture
|
@pytest.yield_fixture
|
||||||
def repo_url(request, tmpdir):
|
def repo_url(request, tmpdir, monkeypatch):
|
||||||
os.environ['BORG_PASSPHRASE'] = '123456'
|
monkeypatch.setenv('BORG_PASSPHRASE', '123456')
|
||||||
os.environ['BORG_CHECK_I_KNOW_WHAT_I_AM_DOING'] = 'YES'
|
monkeypatch.setenv('BORG_CHECK_I_KNOW_WHAT_I_AM_DOING', 'YES')
|
||||||
os.environ['BORG_DELETE_I_KNOW_WHAT_I_AM_DOING'] = 'YES'
|
monkeypatch.setenv('BORG_DELETE_I_KNOW_WHAT_I_AM_DOING', 'YES')
|
||||||
os.environ['BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK'] = 'yes'
|
monkeypatch.setenv('BORG_UNKNOWN_UNENCRYPTED_REPO_ACCESS_IS_OK', 'yes')
|
||||||
os.environ['BORG_KEYS_DIR'] = str(tmpdir.join('keys'))
|
monkeypatch.setenv('BORG_KEYS_DIR', str(tmpdir.join('keys')))
|
||||||
os.environ['BORG_CACHE_DIR'] = str(tmpdir.join('cache'))
|
monkeypatch.setenv('BORG_CACHE_DIR', str(tmpdir.join('cache')))
|
||||||
yield str(tmpdir.join('repository'))
|
yield str(tmpdir.join('repository'))
|
||||||
tmpdir.remove(rec=1)
|
tmpdir.remove(rec=1)
|
||||||
|
|
||||||
|
|
|
@ -823,21 +823,20 @@ def test_yes_input_custom():
|
||||||
assert not yes(falsish=('NOPE', ), input=input)
|
assert not yes(falsish=('NOPE', ), input=input)
|
||||||
|
|
||||||
|
|
||||||
def test_yes_env():
|
def test_yes_env(monkeypatch):
|
||||||
for value in TRUISH:
|
for value in TRUISH:
|
||||||
with environment_variable(OVERRIDE_THIS=value):
|
monkeypatch.setenv('OVERRIDE_THIS', value)
|
||||||
assert yes(env_var_override='OVERRIDE_THIS')
|
assert yes(env_var_override='OVERRIDE_THIS')
|
||||||
for value in FALSISH:
|
for value in FALSISH:
|
||||||
with environment_variable(OVERRIDE_THIS=value):
|
monkeypatch.setenv('OVERRIDE_THIS', value)
|
||||||
assert not yes(env_var_override='OVERRIDE_THIS')
|
assert not yes(env_var_override='OVERRIDE_THIS')
|
||||||
|
|
||||||
|
|
||||||
def test_yes_env_default():
|
def test_yes_env_default(monkeypatch):
|
||||||
for value in DEFAULTISH:
|
for value in DEFAULTISH:
|
||||||
with environment_variable(OVERRIDE_THIS=value):
|
monkeypatch.setenv('OVERRIDE_THIS', value)
|
||||||
assert yes(env_var_override='OVERRIDE_THIS', default=True)
|
assert yes(env_var_override='OVERRIDE_THIS', default=True)
|
||||||
with environment_variable(OVERRIDE_THIS=value):
|
assert not yes(env_var_override='OVERRIDE_THIS', default=False)
|
||||||
assert not yes(env_var_override='OVERRIDE_THIS', default=False)
|
|
||||||
|
|
||||||
|
|
||||||
def test_yes_defaults():
|
def test_yes_defaults():
|
||||||
|
|
|
@ -98,7 +98,7 @@ class MockArgs:
|
||||||
|
|
||||||
|
|
||||||
@pytest.fixture()
|
@pytest.fixture()
|
||||||
def attic_key_file(attic_repo, tmpdir):
|
def attic_key_file(attic_repo, tmpdir, monkeypatch):
|
||||||
"""
|
"""
|
||||||
create an attic key file from the given repo, in the keys
|
create an attic key file from the given repo, in the keys
|
||||||
subdirectory of the given tmpdir
|
subdirectory of the given tmpdir
|
||||||
|
@ -113,13 +113,13 @@ def attic_key_file(attic_repo, tmpdir):
|
||||||
|
|
||||||
# we use the repo dir for the created keyfile, because we do
|
# we use the repo dir for the created keyfile, because we do
|
||||||
# not want to clutter existing keyfiles
|
# not want to clutter existing keyfiles
|
||||||
os.environ['ATTIC_KEYS_DIR'] = keys_dir
|
monkeypatch.setenv('ATTIC_KEYS_DIR', keys_dir)
|
||||||
|
|
||||||
# we use the same directory for the converted files, which
|
# we use the same directory for the converted files, which
|
||||||
# will clutter the previously created one, which we don't care
|
# will clutter the previously created one, which we don't care
|
||||||
# about anyways. in real runs, the original key will be retained.
|
# about anyways. in real runs, the original key will be retained.
|
||||||
os.environ['BORG_KEYS_DIR'] = keys_dir
|
monkeypatch.setenv('BORG_KEYS_DIR', keys_dir)
|
||||||
os.environ['ATTIC_PASSPHRASE'] = 'test'
|
monkeypatch.setenv('ATTIC_PASSPHRASE', 'test')
|
||||||
return attic.key.KeyfileKey.create(attic_repo,
|
return attic.key.KeyfileKey.create(attic_repo,
|
||||||
MockArgs(keys_dir))
|
MockArgs(keys_dir))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue