psw/borgmatic
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make sure restore params in config aren't used when cli args are supplied

Browse source
This commit is contained in:
Divyansh Singh 2023-06-21 00:03:07 +05:30
parent 1a21eb03cd
commit 87c6e5b349
4 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tests/unit/hooks/test_mongodb.py
View file

@ -304,6 +304,10 @@ def test_restore_database_dump_with_connection_params_uses_connection_params_for
'username': 'mongo', 'username': 'mongo',
'password': 'trustsome1', 'password': 'trustsome1',
'authentication_database': 'admin', 'authentication_database': 'admin',
'restore_hostname': 'restorehost',
'restore_port': 'restoreport',
'restore_username': 'restoreusername',
'restore_password': 'restorepassword',
'schemas': None, 'schemas': None,
} }
] ]

12
tests/unit/hooks/test_mysql.py
View file

@ -519,7 +519,17 @@ def test_restore_database_dump_runs_mysql_with_username_and_password():
def test_restore_database_dump_with_connection_params_uses_connection_params_for_restore(): def test_restore_database_dump_with_connection_params_uses_connection_params_for_restore():
database_config = [{'name': 'foo', 'username': 'root', 'password': 'trustsome1'}] database_config = [
{
'name': 'foo',
'username': 'root',
'password': 'trustsome1',
'restore_hostname': 'restorehost',
'restore_port': 'restoreport',
'restore_username': 'restoreusername',
'restore_password': 'restorepassword',
}
]
extract_process = flexmock(stdout=flexmock()) extract_process = flexmock(stdout=flexmock())
flexmock(module).should_receive('execute_command_with_processes').with_args( flexmock(module).should_receive('execute_command_with_processes').with_args(

4
tests/unit/hooks/test_postgresql.py
View file

@ -656,6 +656,10 @@ def test_restore_database_dump_with_connection_params_uses_connection_params_for
'port': 5433, 'port': 5433,
'username': 'postgres', 'username': 'postgres',
'password': 'trustsome1', 'password': 'trustsome1',
'restore_hostname': 'restorehost',
'restore_port': 'restoreport',
'restore_username': 'restoreusername',
'restore_password': 'restorepassword',
'schemas': None, 'schemas': None,
} }
] ]

4
tests/unit/hooks/test_sqlite.py
View file

@ -118,7 +118,9 @@ def test_restore_database_dump_restores_database():
def test_restore_database_dump_with_connection_params_uses_connection_params_for_restore(): def test_restore_database_dump_with_connection_params_uses_connection_params_for_restore():
database_config = [{'path': '/path/to/database', 'name': 'database'}] database_config = [
{'path': '/path/to/database', 'name': 'database', 'restore_path': 'config/path/to/database'}
]
extract_process = flexmock(stdout=flexmock()) extract_process = flexmock(stdout=flexmock())
flexmock(module).should_receive('execute_command_with_processes').with_args( flexmock(module).should_receive('execute_command_with_processes').with_args(