Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor: Use run in update_test_databases_if_required. 

Use `run` to run the tools, and take advantage
that `rebuild-dev-database` is really the same
as `generate-fixtures --force`.
This commit is contained in:
Steve Howell 2020-04-21 20:52:46 +00:00 committed by Tim Abbott
parent b10be1f8b7
commit 23f09fadfa
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
zerver/lib/test_fixtures.py
View File

@ -222,21 +222,19 @@ def update_test_databases_if_required(use_force: bool=False,
If use_force is specified, it will always do a full rebuild.
"""
generate_fixtures_command = ['tools/setup/generate-fixtures']
test_template_db_status = TEST_DATABASE.template_status()
if use_force or test_template_db_status == 'needs_rebuild':
generate_fixtures_command.append('--force')
subprocess.check_call(generate_fixtures_command)
run(['tools/rebuild-dev-database'])
return
if test_template_db_status == 'run_migrations':
TEST_DATABASE.run_db_migrations()
subprocess.check_call(generate_fixtures_command)
run(['tools/setup/generate-fixtures'])
return
if rebuild_test_database:
subprocess.check_call(generate_fixtures_command)
run(['tools/setup/generate-fixtures'])
def get_migration_status(**options: Any) -> str:
verbosity = options.get('verbosity', 1)