Fix flaking issues (#635).

This commit is contained in:
Dan Helfman
2025-01-27 12:28:36 -08:00
parent 7e344e6e0a
commit 63c39be55f
6 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -709,7 +709,7 @@ def run_check(
**hook_context,
)
logger.info(f'Running consistency checks')
logger.info('Running consistency checks')
repository_id = borgmatic.borg.check.get_repository_id(
repository['path'],
+1 -1
View File
@@ -176,7 +176,7 @@ def run_configuration(config_filename, config, config_paths, arguments):
continue
yield from log_error_records(
f'Error running actions for repository',
'Error running actions for repository',
error,
)
encountered_error = error
+1 -1
View File
@@ -49,7 +49,7 @@ def database_names_to_dump(database, extra_environment, dry_run):
+ ('--skip-column-names', '--batch')
+ ('--execute', 'show schemas')
)
logger.debug(f'Querying for "all" MariaDB databases to dump')
logger.debug('Querying for "all" MariaDB databases to dump')
show_output = execute_command_and_capture_output(
show_command, extra_environment=extra_environment
)
+1 -1
View File
@@ -49,7 +49,7 @@ def database_names_to_dump(database, extra_environment, dry_run):
+ ('--skip-column-names', '--batch')
+ ('--execute', 'show schemas')
)
logger.debug(f'Querying for "all" MySQL databases to dump')
logger.debug('Querying for "all" MySQL databases to dump')
show_output = execute_command_and_capture_output(
show_command, extra_environment=extra_environment
)
+1 -1
View File
@@ -85,7 +85,7 @@ def database_names_to_dump(database, extra_environment, dry_run):
+ (('--username', database['username']) if 'username' in database else ())
+ (tuple(database['list_options'].split(' ')) if 'list_options' in database else ())
)
logger.debug(f'Querying for "all" PostgreSQL databases to dump')
logger.debug('Querying for "all" PostgreSQL databases to dump')
list_output = execute_command_and_capture_output(
list_command, extra_environment=extra_environment
)
+3 -3
View File
@@ -254,7 +254,7 @@ def test_get_log_prefix_with_no_handlers_does_not_raise():
)
)
assert module.get_log_prefix() == None
assert module.get_log_prefix() is None
def test_get_log_prefix_with_no_formatters_does_not_raise():
@@ -268,7 +268,7 @@ def test_get_log_prefix_with_no_formatters_does_not_raise():
)
)
assert module.get_log_prefix() == None
assert module.get_log_prefix() is None
def test_get_log_prefix_with_no_prefix_does_not_raise():
@@ -284,7 +284,7 @@ def test_get_log_prefix_with_no_prefix_does_not_raise():
)
)
assert module.get_log_prefix() == None
assert module.get_log_prefix() is None
def test_set_log_prefix_updates_all_handlers():