From c1ddc4268bd3571c7b5f204492d80bd8cdfae295 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Mon, 15 Oct 2018 09:30:04 -0700 Subject: [PATCH] We can't have nice things. --- tests/end-to-end/test_borgmatic.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/end-to-end/test_borgmatic.py b/tests/end-to-end/test_borgmatic.py index a4157894..5524d6dd 100644 --- a/tests/end-to-end/test_borgmatic.py +++ b/tests/end-to-end/test_borgmatic.py @@ -11,12 +11,12 @@ def generate_configuration(config_path, repository_path): Generate borgmatic configuration into a file at the config path, and update the defaults so as to work for testing (including injecting the given repository path). ''' - subprocess.check_call(f'generate-borgmatic-config --destination {config_path}'.split(' ')) + subprocess.check_call('generate-borgmatic-config --destination {}'.format(config_path).split(' ')) config = ( open(config_path) .read() .replace('user@backupserver:sourcehostname.borg', repository_path) - .replace('- /home', f'- {config_path}') + .replace('- /home', '- {}'.format(config_path)) .replace('- /etc', '') .replace('- /var/log/syslog*', '') ) @@ -32,7 +32,7 @@ def test_borgmatic_command(): try: subprocess.check_call( - f'borg init --encryption repokey {repository_path}'.split(' '), + 'borg init --encryption repokey {}'.format(repository_path).split(' '), env={'BORG_PASSPHRASE': '', **os.environ}, ) @@ -40,9 +40,9 @@ def test_borgmatic_command(): generate_configuration(config_path, repository_path) # Run borgmatic to generate a backup archive, and then list it to make sure it exists. - subprocess.check_call(f'borgmatic --config {config_path}'.split(' ')) + subprocess.check_call('borgmatic --config {}'.format(config_path).split(' ')) output = subprocess.check_output( - f'borgmatic --config {config_path} --list --json'.split(' '), + 'borgmatic --config {} --list --json'.format(config_path).split(' '), encoding=sys.stdout.encoding, ) parsed_output = json.loads(output) @@ -52,7 +52,7 @@ def test_borgmatic_command(): # Also exercise the info flag. output = subprocess.check_output( - f'borgmatic --config {config_path} --info --json'.split(' '), + 'borgmatic --config {} --info --json'.format(config_path).split(' '), encoding=sys.stdout.encoding, ) parsed_output = json.loads(output)