From 325b5612965cfff4f7cb8b9a3904f7eeddbd1270 Mon Sep 17 00:00:00 2001 From: Dan Helfman Date: Sat, 24 Jun 2023 15:52:20 -0700 Subject: [PATCH] Switch from "init" to "rcreate" for creating repos in end-to-end tests. --- tests/end-to-end/test_borgmatic.py | 2 +- tests/end-to-end/test_database.py | 10 +++++----- tests/end-to-end/test_override.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/end-to-end/test_borgmatic.py b/tests/end-to-end/test_borgmatic.py index f2b81a8..93fd27a 100644 --- a/tests/end-to-end/test_borgmatic.py +++ b/tests/end-to-end/test_borgmatic.py @@ -44,7 +44,7 @@ def test_borgmatic_command(): generate_configuration(config_path, repository_path) subprocess.check_call( - f'borgmatic -v 2 --config {config_path} init --encryption repokey'.split(' ') + f'borgmatic -v 2 --config {config_path} rcreate --encryption repokey'.split(' ') ) # Run borgmatic to generate a backup archive, and then list it to make sure it exists. diff --git a/tests/end-to-end/test_database.py b/tests/end-to-end/test_database.py index fd565b2..0a10339 100644 --- a/tests/end-to-end/test_database.py +++ b/tests/end-to-end/test_database.py @@ -202,7 +202,7 @@ def test_database_dump_and_restore(): ) subprocess.check_call( - ['borgmatic', '-v', '2', '--config', config_path, 'init', '--encryption', 'repokey'] + ['borgmatic', '-v', '2', '--config', config_path, 'rcreate', '--encryption', 'repokey'] ) # Run borgmatic to generate a backup archive including a database dump. @@ -242,7 +242,7 @@ def test_database_dump_and_restore_with_restore_cli_arguments(): ) subprocess.check_call( - ['borgmatic', '-v', '2', '--config', config_path, 'init', '--encryption', 'repokey'] + ['borgmatic', '-v', '2', '--config', config_path, 'rcreate', '--encryption', 'repokey'] ) # Run borgmatic to generate a backup archive including a database dump. @@ -299,7 +299,7 @@ def test_database_dump_and_restore_with_restore_configuration_options(): ) subprocess.check_call( - ['borgmatic', '-v', '2', '--config', config_path, 'init', '--encryption', 'repokey'] + ['borgmatic', '-v', '2', '--config', config_path, 'rcreate', '--encryption', 'repokey'] ) # Run borgmatic to generate a backup archive including a database dump. @@ -344,7 +344,7 @@ def test_database_dump_and_restore_with_directory_format(): ) subprocess.check_call( - ['borgmatic', '-v', '2', '--config', config_path, 'init', '--encryption', 'repokey'] + ['borgmatic', '-v', '2', '--config', config_path, 'rcreate', '--encryption', 'repokey'] ) # Run borgmatic to generate a backup archive including a database dump. @@ -374,7 +374,7 @@ def test_database_dump_with_error_causes_borgmatic_to_exit(): ) subprocess.check_call( - ['borgmatic', '-v', '2', '--config', config_path, 'init', '--encryption', 'repokey'] + ['borgmatic', '-v', '2', '--config', config_path, 'rcreate', '--encryption', 'repokey'] ) # Run borgmatic with a config override such that the database dump fails. diff --git a/tests/end-to-end/test_override.py b/tests/end-to-end/test_override.py index e91e28b..7debc6e 100644 --- a/tests/end-to-end/test_override.py +++ b/tests/end-to-end/test_override.py @@ -39,7 +39,7 @@ def test_override_get_normalized(): generate_configuration(config_path, repository_path) subprocess.check_call( - f'borgmatic -v 2 --config {config_path} init --encryption repokey'.split(' ') + f'borgmatic -v 2 --config {config_path} rcreate --encryption repokey'.split(' ') ) # Run borgmatic with an override structured for an outdated config file format. If