From a926b413bca6899d8e9f5defa67dfe30dccaeda2 Mon Sep 17 00:00:00 2001 From: Geoff Holden Date: Thu, 6 Mar 2025 09:00:33 -0330 Subject: [PATCH] Updating automated test, and fixing linting errors. --- borgmatic/hooks/data_source/mariadb.py | 2 +- tests/unit/hooks/data_source/test_mariadb.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/borgmatic/hooks/data_source/mariadb.py b/borgmatic/hooks/data_source/mariadb.py index eaf05f2d..8d54e12c 100644 --- a/borgmatic/hooks/data_source/mariadb.py +++ b/borgmatic/hooks/data_source/mariadb.py @@ -68,7 +68,7 @@ def make_defaults_file_options(username=None, password=None, defaults_extra_file values = '\n'.join( ( (f'user={username}' if username is not None else ''), - (f'password=\'{password}\'' if password is not None else ''), + (f"password='{password}'" if password is not None else ''), ) ).strip() diff --git a/tests/unit/hooks/data_source/test_mariadb.py b/tests/unit/hooks/data_source/test_mariadb.py index c6b88099..4328f7e6 100644 --- a/tests/unit/hooks/data_source/test_mariadb.py +++ b/tests/unit/hooks/data_source/test_mariadb.py @@ -36,7 +36,7 @@ def test_make_defaults_file_option_with_username_and_password_writes_them_to_fil flexmock(module.os).should_receive('pipe').and_return(read_descriptor, write_descriptor) flexmock(module.os).should_receive('write').with_args( - write_descriptor, b'[client]\nuser=root\npassword=trustsome1' + write_descriptor, b"[client]\nuser=root\npassword='trustsome1'" ).once() flexmock(module.os).should_receive('close') flexmock(module.os).should_receive('set_inheritable') @@ -68,7 +68,7 @@ def test_make_defaults_file_pipe_with_only_password_writes_it_to_file_descriptor flexmock(module.os).should_receive('pipe').and_return(read_descriptor, write_descriptor) flexmock(module.os).should_receive('write').with_args( - write_descriptor, b'[client]\npassword=trustsome1' + write_descriptor, b"[client]\npassword='trustsome1'" ).once() flexmock(module.os).should_receive('close') flexmock(module.os).should_receive('set_inheritable') @@ -84,7 +84,7 @@ def test_make_defaults_file_option_with_defaults_extra_filename_includes_it_in_f flexmock(module.os).should_receive('pipe').and_return(read_descriptor, write_descriptor) flexmock(module.os).should_receive('write').with_args( - write_descriptor, b'!include extra.cnf\n[client]\nuser=root\npassword=trustsome1' + write_descriptor, b"!include extra.cnf\n[client]\nuser=root\npassword='trustsome1'" ).once() flexmock(module.os).should_receive('close') flexmock(module.os).should_receive('set_inheritable')