Remove MySQL/MariaDB database dumps after backing them up (#228).

This commit is contained in:
Dan Helfman 2019-11-08 11:53:27 -08:00
parent 427b57e2a9
commit 9d29ecf304
10 changed files with 154 additions and 118 deletions

View file

@ -107,6 +107,9 @@ def run_configuration(config_filename, config, arguments):
postgresql.remove_database_dumps( postgresql.remove_database_dumps(
hooks.get('postgresql_databases'), config_filename, global_arguments.dry_run hooks.get('postgresql_databases'), config_filename, global_arguments.dry_run
) )
mysql.remove_database_dumps(
hooks.get('mysql_databases'), config_filename, global_arguments.dry_run
)
command.execute_hook( command.execute_hook(
hooks.get('after_backup'), hooks.get('after_backup'),
hooks.get('umask'), hooks.get('umask'),

View file

@ -1,14 +0,0 @@
import os
def make_database_dump_filename(dump_path, name, hostname=None):
'''
Based on the given dump directory path, database name, and hostname, return a filename to use
for the database dump. The hostname defaults to localhost.
Raise ValueError if the database name is invalid.
'''
if os.path.sep in name:
raise ValueError('Invalid database name {}'.format(name))
return os.path.join(os.path.expanduser(dump_path), hostname or 'localhost', name)

54
borgmatic/hooks/dump.py Normal file
View file

@ -0,0 +1,54 @@
import logging
import os
logger = logging.getLogger(__name__)
def make_database_dump_filename(dump_path, name, hostname=None):
'''
Based on the given dump directory path, database name, and hostname, return a filename to use
for the database dump. The hostname defaults to localhost.
Raise ValueError if the database name is invalid.
'''
if os.path.sep in name:
raise ValueError('Invalid database name {}'.format(name))
return os.path.join(os.path.expanduser(dump_path), hostname or 'localhost', name)
def remove_database_dumps(dump_path, databases, database_type_name, log_prefix, dry_run):
'''
Remove the database dumps for the given databases in the dump directory path. The databases are
supplied as a sequence of dicts, one dict describing each database as per the configuration
schema. Use the name of the database type and the log prefix in any log entries. If this is a
dry run, then don't actually remove anything.
'''
if not databases:
logger.debug('{}: No {} databases configured'.format(log_prefix, database_type_name))
return
dry_run_label = ' (dry run; not actually removing anything)' if dry_run else ''
logger.info(
'{}: Removing {} database dumps{}'.format(log_prefix, database_type_name, dry_run_label)
)
for database in databases:
dump_filename = make_database_dump_filename(
dump_path, database['name'], database.get('hostname')
)
logger.debug(
'{}: Removing {} database dump {} from {}{}'.format(
log_prefix, database_type_name, database['name'], dump_filename, dry_run_label
)
)
if dry_run:
continue
os.remove(dump_filename)
dump_path = os.path.dirname(dump_filename)
if len(os.listdir(dump_path)) == 0:
os.rmdir(dump_path)

View file

@ -2,7 +2,7 @@ import logging
import os import os
from borgmatic.execute import execute_command from borgmatic.execute import execute_command
from borgmatic.hooks.database import make_database_dump_filename from borgmatic.hooks import dump
DUMP_PATH = '~/.borgmatic/mysql_databases' DUMP_PATH = '~/.borgmatic/mysql_databases'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -24,7 +24,7 @@ def dump_databases(databases, log_prefix, dry_run):
for database in databases: for database in databases:
name = database['name'] name = database['name']
dump_filename = make_database_dump_filename(DUMP_PATH, name, database.get('hostname')) dump_filename = dump.make_database_dump_filename(DUMP_PATH, name, database.get('hostname'))
command = ( command = (
('mysqldump', '--add-drop-database') ('mysqldump', '--add-drop-database')
+ (('--host', database['hostname']) if 'hostname' in database else ()) + (('--host', database['hostname']) if 'hostname' in database else ())
@ -46,3 +46,12 @@ def dump_databases(databases, log_prefix, dry_run):
execute_command( execute_command(
command, output_file=open(dump_filename, 'w'), extra_environment=extra_environment command, output_file=open(dump_filename, 'w'), extra_environment=extra_environment
) )
def remove_database_dumps(databases, log_prefix, dry_run):
'''
Remove the database dumps for the given databases. The databases are supplied as a sequence of
dicts, one dict describing each database as per the configuration schema. Use the log prefix in
any log entries. If this is a dry run, then don't actually remove anything.
'''
dump.remove_database_dumps(DUMP_PATH, databases, 'MySQL', log_prefix, dry_run)

View file

@ -3,7 +3,7 @@ import logging
import os import os
from borgmatic.execute import execute_command from borgmatic.execute import execute_command
from borgmatic.hooks.database import make_database_dump_filename from borgmatic.hooks import dump
DUMP_PATH = '~/.borgmatic/postgresql_databases' DUMP_PATH = '~/.borgmatic/postgresql_databases'
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -25,7 +25,7 @@ def dump_databases(databases, log_prefix, dry_run):
for database in databases: for database in databases:
name = database['name'] name = database['name']
dump_filename = make_database_dump_filename(DUMP_PATH, name, database.get('hostname')) dump_filename = dump.make_database_dump_filename(DUMP_PATH, name, database.get('hostname'))
all_databases = bool(name == 'all') all_databases = bool(name == 'all')
command = ( command = (
('pg_dumpall' if all_databases else 'pg_dump', '--no-password', '--clean') ('pg_dumpall' if all_databases else 'pg_dump', '--no-password', '--clean')
@ -55,32 +55,7 @@ def remove_database_dumps(databases, log_prefix, dry_run):
dicts, one dict describing each database as per the configuration schema. Use the log prefix in dicts, one dict describing each database as per the configuration schema. Use the log prefix in
any log entries. If this is a dry run, then don't actually remove anything. any log entries. If this is a dry run, then don't actually remove anything.
''' '''
if not databases: dump.remove_database_dumps(DUMP_PATH, databases, 'PostgreSQL', log_prefix, dry_run)
logger.debug('{}: No PostgreSQL databases configured'.format(log_prefix))
return
dry_run_label = ' (dry run; not actually removing anything)' if dry_run else ''
logger.info('{}: Removing PostgreSQL database dumps{}'.format(log_prefix, dry_run_label))
for database in databases:
dump_filename = make_database_dump_filename(
DUMP_PATH, database['name'], database.get('hostname')
)
logger.debug(
'{}: Removing PostgreSQL database dump {} from {}{}'.format(
log_prefix, database['name'], dump_filename, dry_run_label
)
)
if dry_run:
continue
os.remove(dump_filename)
dump_path = os.path.dirname(dump_filename)
if len(os.listdir(dump_path)) == 0:
os.rmdir(dump_path)
def make_database_dump_patterns(names): def make_database_dump_patterns(names):
@ -89,7 +64,9 @@ def make_database_dump_patterns(names):
dumps in an archive. An empty sequence of names indicates that the patterns should match all dumps in an archive. An empty sequence of names indicates that the patterns should match all
dumps. dumps.
''' '''
return [make_database_dump_filename(DUMP_PATH, name, hostname='*') for name in (names or ['*'])] return [
dump.make_database_dump_filename(DUMP_PATH, name, hostname='*') for name in (names or ['*'])
]
def convert_glob_patterns_to_borg_patterns(patterns): def convert_glob_patterns_to_borg_patterns(patterns):
@ -150,7 +127,7 @@ def restore_database_dumps(databases, log_prefix, dry_run):
dry_run_label = ' (dry run; not actually restoring anything)' if dry_run else '' dry_run_label = ' (dry run; not actually restoring anything)' if dry_run else ''
for database in databases: for database in databases:
dump_filename = make_database_dump_filename( dump_filename = dump.make_database_dump_filename(
DUMP_PATH, database['name'], database.get('hostname') DUMP_PATH, database['name'], database.get('hostname')
) )
restore_command = ( restore_command = (

View file

@ -24,8 +24,12 @@ def test_run_configuration_executes_hooks_for_create_action():
flexmock(module.borg_environment).should_receive('initialize') flexmock(module.borg_environment).should_receive('initialize')
flexmock(module.command).should_receive('execute_hook').twice() flexmock(module.command).should_receive('execute_hook').twice()
flexmock(module.postgresql).should_receive('dump_databases').once() flexmock(module.postgresql).should_receive('dump_databases').once()
flexmock(module.mysql).should_receive('dump_databases').once()
flexmock(module.healthchecks).should_receive('ping_healthchecks').twice() flexmock(module.healthchecks).should_receive('ping_healthchecks').twice()
flexmock(module.cronitor).should_receive('ping_cronitor').twice()
flexmock(module.cronhub).should_receive('ping_cronhub').twice()
flexmock(module.postgresql).should_receive('remove_database_dumps').once() flexmock(module.postgresql).should_receive('remove_database_dumps').once()
flexmock(module.mysql).should_receive('remove_database_dumps').once()
flexmock(module).should_receive('run_actions').and_return([]) flexmock(module).should_receive('run_actions').and_return([])
config = {'location': {'repositories': ['foo']}} config = {'location': {'repositories': ['foo']}}
arguments = {'global': flexmock(dry_run=False), 'create': flexmock()} arguments = {'global': flexmock(dry_run=False), 'create': flexmock()}
@ -37,7 +41,10 @@ def test_run_configuration_logs_actions_error():
flexmock(module.borg_environment).should_receive('initialize') flexmock(module.borg_environment).should_receive('initialize')
flexmock(module.command).should_receive('execute_hook') flexmock(module.command).should_receive('execute_hook')
flexmock(module.postgresql).should_receive('dump_databases') flexmock(module.postgresql).should_receive('dump_databases')
flexmock(module.mysql).should_receive('dump_databases')
flexmock(module.healthchecks).should_receive('ping_healthchecks') flexmock(module.healthchecks).should_receive('ping_healthchecks')
flexmock(module.cronitor).should_receive('ping_cronitor')
flexmock(module.cronhub).should_receive('ping_cronhub')
expected_results = [flexmock()] expected_results = [flexmock()]
flexmock(module).should_receive('make_error_log_records').and_return(expected_results) flexmock(module).should_receive('make_error_log_records').and_return(expected_results)
flexmock(module).should_receive('run_actions').and_raise(OSError) flexmock(module).should_receive('run_actions').and_raise(OSError)

View file

@ -1,26 +0,0 @@
import pytest
from flexmock import flexmock
from borgmatic.hooks import database as module
def test_make_database_dump_filename_uses_name_and_hostname():
flexmock(module.os.path).should_receive('expanduser').and_return('databases')
assert (
module.make_database_dump_filename('databases', 'test', 'hostname')
== 'databases/hostname/test'
)
def test_make_database_dump_filename_without_hostname_defaults_to_localhost():
flexmock(module.os.path).should_receive('expanduser').and_return('databases')
assert module.make_database_dump_filename('databases', 'test') == 'databases/localhost/test'
def test_make_database_dump_filename_with_invalid_name_raises():
flexmock(module.os.path).should_receive('expanduser').and_return('databases')
with pytest.raises(ValueError):
module.make_database_dump_filename('databases', 'invalid/name')

View file

@ -0,0 +1,54 @@
import pytest
from flexmock import flexmock
from borgmatic.hooks import dump as module
def test_make_database_dump_filename_uses_name_and_hostname():
flexmock(module.os.path).should_receive('expanduser').and_return('databases')
assert (
module.make_database_dump_filename('databases', 'test', 'hostname')
== 'databases/hostname/test'
)
def test_make_database_dump_filename_without_hostname_defaults_to_localhost():
flexmock(module.os.path).should_receive('expanduser').and_return('databases')
assert module.make_database_dump_filename('databases', 'test') == 'databases/localhost/test'
def test_make_database_dump_filename_with_invalid_name_raises():
flexmock(module.os.path).should_receive('expanduser').and_return('databases')
with pytest.raises(ValueError):
module.make_database_dump_filename('databases', 'invalid/name')
def test_remove_database_dumps_removes_dump_for_each_database():
databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo'
).and_return('databases/localhost/bar')
flexmock(module.os).should_receive('listdir').and_return([])
flexmock(module.os).should_receive('rmdir')
for name in ('foo', 'bar'):
flexmock(module.os).should_receive('remove').with_args(
'databases/localhost/{}'.format(name)
).once()
module.remove_database_dumps('databases', databases, 'SuperDB', 'test.yaml', dry_run=False)
def test_remove_database_dumps_with_dry_run_skips_removal():
databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module.os).should_receive('rmdir').never()
flexmock(module.os).should_receive('remove').never()
module.remove_database_dumps('databases', databases, 'SuperDB', 'test.yaml', dry_run=True)
def test_remove_database_dumps_without_databases_does_not_raise():
module.remove_database_dumps('databases', [], 'SuperDB', 'test.yaml', dry_run=False)

View file

@ -8,7 +8,7 @@ from borgmatic.hooks import mysql as module
def test_dump_databases_runs_mysqldump_for_each_database(): def test_dump_databases_runs_mysqldump_for_each_database():
databases = [{'name': 'foo'}, {'name': 'bar'}] databases = [{'name': 'foo'}, {'name': 'bar'}]
output_file = flexmock() output_file = flexmock()
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -26,7 +26,7 @@ def test_dump_databases_runs_mysqldump_for_each_database():
def test_dump_databases_with_dry_run_skips_mysqldump(): def test_dump_databases_with_dry_run_skips_mysqldump():
databases = [{'name': 'foo'}, {'name': 'bar'}] databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')
flexmock(module.os).should_receive('makedirs').never() flexmock(module.os).should_receive('makedirs').never()
@ -42,7 +42,7 @@ def test_dump_databases_without_databases_does_not_raise():
def test_dump_databases_runs_mysqldump_with_hostname_and_port(): def test_dump_databases_runs_mysqldump_with_hostname_and_port():
databases = [{'name': 'foo', 'hostname': 'database.example.org', 'port': 5433}] databases = [{'name': 'foo', 'hostname': 'database.example.org', 'port': 5433}]
output_file = flexmock() output_file = flexmock()
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/database.example.org/foo' 'databases/database.example.org/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -71,7 +71,7 @@ def test_dump_databases_runs_mysqldump_with_hostname_and_port():
def test_dump_databases_runs_mysqldump_with_username_and_password(): def test_dump_databases_runs_mysqldump_with_username_and_password():
databases = [{'name': 'foo', 'username': 'root', 'password': 'trustsome1'}] databases = [{'name': 'foo', 'username': 'root', 'password': 'trustsome1'}]
output_file = flexmock() output_file = flexmock()
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -89,7 +89,7 @@ def test_dump_databases_runs_mysqldump_with_username_and_password():
def test_dump_databases_runs_mysqldump_with_options(): def test_dump_databases_runs_mysqldump_with_options():
databases = [{'name': 'foo', 'options': '--stuff=such'}] databases = [{'name': 'foo', 'options': '--stuff=such'}]
output_file = flexmock() output_file = flexmock()
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -107,7 +107,7 @@ def test_dump_databases_runs_mysqldump_with_options():
def test_dump_databases_runs_mysqldump_for_all_databases(): def test_dump_databases_runs_mysqldump_for_all_databases():
databases = [{'name': 'all'}] databases = [{'name': 'all'}]
output_file = flexmock() output_file = flexmock()
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/all' 'databases/localhost/all'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')

View file

@ -6,7 +6,7 @@ from borgmatic.hooks import postgresql as module
def test_dump_databases_runs_pg_dump_for_each_database(): def test_dump_databases_runs_pg_dump_for_each_database():
databases = [{'name': 'foo'}, {'name': 'bar'}] databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -31,7 +31,7 @@ def test_dump_databases_runs_pg_dump_for_each_database():
def test_dump_databases_with_dry_run_skips_pg_dump(): def test_dump_databases_with_dry_run_skips_pg_dump():
databases = [{'name': 'foo'}, {'name': 'bar'}] databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')
flexmock(module.os).should_receive('makedirs').never() flexmock(module.os).should_receive('makedirs').never()
@ -46,7 +46,7 @@ def test_dump_databases_without_databases_does_not_raise():
def test_dump_databases_runs_pg_dump_with_hostname_and_port(): def test_dump_databases_runs_pg_dump_with_hostname_and_port():
databases = [{'name': 'foo', 'hostname': 'database.example.org', 'port': 5433}] databases = [{'name': 'foo', 'hostname': 'database.example.org', 'port': 5433}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/database.example.org/foo' 'databases/database.example.org/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -74,7 +74,7 @@ def test_dump_databases_runs_pg_dump_with_hostname_and_port():
def test_dump_databases_runs_pg_dump_with_username_and_password(): def test_dump_databases_runs_pg_dump_with_username_and_password():
databases = [{'name': 'foo', 'username': 'postgres', 'password': 'trustsome1'}] databases = [{'name': 'foo', 'username': 'postgres', 'password': 'trustsome1'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -100,7 +100,7 @@ def test_dump_databases_runs_pg_dump_with_username_and_password():
def test_dump_databases_runs_pg_dump_with_format(): def test_dump_databases_runs_pg_dump_with_format():
databases = [{'name': 'foo', 'format': 'tar'}] databases = [{'name': 'foo', 'format': 'tar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -124,7 +124,7 @@ def test_dump_databases_runs_pg_dump_with_format():
def test_dump_databases_runs_pg_dump_with_options(): def test_dump_databases_runs_pg_dump_with_options():
databases = [{'name': 'foo', 'options': '--stuff=such'}] databases = [{'name': 'foo', 'options': '--stuff=such'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -149,7 +149,7 @@ def test_dump_databases_runs_pg_dump_with_options():
def test_dump_databases_runs_pg_dumpall_for_all_databases(): def test_dump_databases_runs_pg_dumpall_for_all_databases():
databases = [{'name': 'all'}] databases = [{'name': 'all'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/all' 'databases/localhost/all'
) )
flexmock(module.os).should_receive('makedirs') flexmock(module.os).should_receive('makedirs')
@ -162,36 +162,8 @@ def test_dump_databases_runs_pg_dumpall_for_all_databases():
module.dump_databases(databases, 'test.yaml', dry_run=False) module.dump_databases(databases, 'test.yaml', dry_run=False)
def test_remove_database_dumps_removes_dump_for_each_database():
databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo'
).and_return('databases/localhost/bar')
flexmock(module.os).should_receive('listdir').and_return([])
flexmock(module.os).should_receive('rmdir')
for name in ('foo', 'bar'):
flexmock(module.os).should_receive('remove').with_args(
'databases/localhost/{}'.format(name)
).once()
module.remove_database_dumps(databases, 'test.yaml', dry_run=False)
def test_remove_database_dumps_with_dry_run_skips_removal():
databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module.os).should_receive('rmdir').never()
flexmock(module.os).should_receive('remove').never()
module.remove_database_dumps(databases, 'test.yaml', dry_run=True)
def test_remove_database_dumps_without_databases_does_not_raise():
module.remove_database_dumps([], 'test.yaml', dry_run=False)
def test_make_database_dump_patterns_converts_names_to_glob_paths(): def test_make_database_dump_patterns_converts_names_to_glob_paths():
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/*/foo' 'databases/*/foo'
).and_return('databases/*/bar') ).and_return('databases/*/bar')
@ -202,7 +174,7 @@ def test_make_database_dump_patterns_converts_names_to_glob_paths():
def test_make_database_dump_patterns_treats_empty_names_as_matching_all_databases(): def test_make_database_dump_patterns_treats_empty_names_as_matching_all_databases():
flexmock(module).should_receive('make_database_dump_filename').with_args( flexmock(module.dump).should_receive('make_database_dump_filename').with_args(
module.DUMP_PATH, '*', '*' module.DUMP_PATH, '*', '*'
).and_return('databases/*/*') ).and_return('databases/*/*')
@ -258,7 +230,7 @@ def test_get_database_configurations_with_unknown_database_name_raises():
def test_restore_database_dumps_restores_each_database(): def test_restore_database_dumps_restores_each_database():
databases = [{'name': 'foo'}, {'name': 'bar'}] databases = [{'name': 'foo'}, {'name': 'bar'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')
@ -290,7 +262,7 @@ def test_restore_database_dumps_without_databases_does_not_raise():
def test_restore_database_dumps_runs_pg_restore_with_hostname_and_port(): def test_restore_database_dumps_runs_pg_restore_with_hostname_and_port():
databases = [{'name': 'foo', 'hostname': 'database.example.org', 'port': 5433}] databases = [{'name': 'foo', 'hostname': 'database.example.org', 'port': 5433}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')
@ -333,7 +305,7 @@ def test_restore_database_dumps_runs_pg_restore_with_hostname_and_port():
def test_restore_database_dumps_runs_pg_restore_with_username_and_password(): def test_restore_database_dumps_runs_pg_restore_with_username_and_password():
databases = [{'name': 'foo', 'username': 'postgres', 'password': 'trustsome1'}] databases = [{'name': 'foo', 'username': 'postgres', 'password': 'trustsome1'}]
flexmock(module).should_receive('make_database_dump_filename').and_return( flexmock(module.dump).should_receive('make_database_dump_filename').and_return(
'databases/localhost/foo' 'databases/localhost/foo'
).and_return('databases/localhost/bar') ).and_return('databases/localhost/bar')