peter/borgmatic
1
0
Fork 0
mirror of https://github.com/borgmatic-collective/borgmatic.git synced 2026-07-22 02:03:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix for the "restore" action sometimes failing to find a database dump that was dumped with a default port (#1322).

Browse Source
This commit is contained in:
Dan Helfman
2026-06-15 11:56:04 -07:00
parent fa099b8471
commit beaeea25b3
9 changed files with 510 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/unit/hooks/data_source/test_mariadb.py
+80
View File
@@ -1426,6 +1426,86 @@ def test_execute_dump_command_with_dry_run_skips_mariadb_dump():
)
def test_make_data_source_dump_patterns_with_no_port_adds_pattern_with_default_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=None,
) == (
'borgmatic/host/db',
'run/host/db',
'.borgmatic/host/db',
'borgmatic/host:9999/db',
)
def test_make_data_source_dump_patterns_with_default_port_adds_pattern_with_no_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=9999,
) == (
'borgmatic/host:9999/db',
'run/host:9999/db',
'.borgmatic/host:9999/db',
'borgmatic/host/db',
)
def test_make_data_source_dump_patterns_with_non_default_port_adds_no_extra_patterns():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=1234,
) == (
'borgmatic/host:1234/db',
'run/host:1234/db',
'.borgmatic/host:1234/db',
)
def test_restore_data_source_dump_runs_mariadb_to_restore():
hook_config = [{'name': 'foo'}, {'name': 'bar'}]
extract_process = flexmock(stdout=flexmock())
tests/unit/hooks/data_source/test_mongodb.py
+80
View File
@@ -378,6 +378,86 @@ def test_build_dump_command_with_username_injection_attack_gets_escaped():
assert "'bob; naughty-command'" in command
def test_make_data_source_dump_patterns_with_no_port_adds_pattern_with_default_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=None,
) == (
'borgmatic/host/db',
'run/host/db',
'.borgmatic/host/db',
'borgmatic/host:9999/db',
)
def test_make_data_source_dump_patterns_with_default_port_adds_pattern_with_no_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=9999,
) == (
'borgmatic/host:9999/db',
'run/host:9999/db',
'.borgmatic/host:9999/db',
'borgmatic/host/db',
)
def test_make_data_source_dump_patterns_with_non_default_port_adds_no_extra_patterns():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=1234,
) == (
'borgmatic/host:1234/db',
'run/host:1234/db',
'.borgmatic/host:1234/db',
)
def test_restore_data_source_dump_runs_mongorestore():
hook_config = [{'name': 'foo', 'schemas': None}, {'name': 'bar'}]
extract_process = flexmock(stdout=flexmock())
tests/unit/hooks/data_source/test_mysql.py
+80
View File
@@ -1239,6 +1239,86 @@ def test_execute_dump_command_with_dry_run_skips_mysqldump():
)
def test_make_data_source_dump_patterns_with_no_port_adds_pattern_with_default_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=None,
) == (
'borgmatic/host/db',
'run/host/db',
'.borgmatic/host/db',
'borgmatic/host:9999/db',
)
def test_make_data_source_dump_patterns_with_default_port_adds_pattern_with_no_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=9999,
) == (
'borgmatic/host:9999/db',
'run/host:9999/db',
'.borgmatic/host:9999/db',
'borgmatic/host/db',
)
def test_make_data_source_dump_patterns_with_non_default_port_adds_no_extra_patterns():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=1234,
) == (
'borgmatic/host:1234/db',
'run/host:1234/db',
'.borgmatic/host:1234/db',
)
def test_restore_data_source_dump_runs_mysql_to_restore():
hook_config = [{'name': 'foo'}, {'name': 'bar'}]
extract_process = flexmock(stdout=flexmock())
tests/unit/hooks/data_source/test_postgresql.py
+80
View File
@@ -979,6 +979,86 @@ def test_dump_data_sources_runs_non_default_pg_dump():
) == [process]
def test_make_data_source_dump_patterns_with_no_port_adds_pattern_with_default_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=None,
) == (
'borgmatic/host/db',
'run/host/db',
'.borgmatic/host/db',
'borgmatic/host:9999/db',
)
def test_make_data_source_dump_patterns_with_default_port_adds_pattern_with_no_port():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=9999,
) == (
'borgmatic/host:9999/db',
'run/host:9999/db',
'.borgmatic/host:9999/db',
'borgmatic/host/db',
)
def test_make_data_source_dump_patterns_with_non_default_port_adds_no_extra_patterns():
flexmock(module.borgmatic.config.paths).should_receive(
'get_borgmatic_source_directory'
).and_return('.borgmatic')
flexmock(module).should_receive('make_dump_path').replace_with(lambda path: path)
flexmock(module.dump).should_receive('make_data_source_dump_filename').replace_with(
lambda dump_path, name, hostname, port, container, label: '/'.join(
(dump_path, f'{hostname}:{port}' if port else hostname, name)
)
)
flexmock(module).should_receive('get_default_port').and_return(9999)
assert module.make_data_source_dump_patterns(
databases=flexmock(),
config=flexmock(),
borgmatic_runtime_directory='run',
name='db',
hostname='host',
port=1234,
) == (
'borgmatic/host:1234/db',
'run/host:1234/db',
'.borgmatic/host:1234/db',
)
def test_restore_data_source_dump_runs_pg_restore():
hook_config = [{'name': 'foo', 'schemas': None}, {'name': 'bar'}]
extract_process = flexmock(stdout=flexmock())