paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-05 22:43:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

test_fixtures: Add run_generate_fixtures_if_required function.

Browse Source 
In this commit we are adding run_generate_fixtures_if_required,
a new function which is meant to de-duplicate a bit of code
between test-server and test-backend which is essentially
responsible for rebuilding the test database if that was required.
This commit is contained in:
Aditya Bansal
2018-06-06 04:19:48 +05:30
committed by Tim Abbott
parent f7c11d1747
commit 65dc80fe9d
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/lib/test_server.py
View File

@@ -19,7 +19,7 @@ TOOLS_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
if TOOLS_DIR not in sys.path:
sys.path.insert(0, os.path.dirname(TOOLS_DIR))
from zerver.lib.test_fixtures import template_database_status
from zerver.lib.test_fixtures import run_generate_fixtures_if_required
def set_up_django(external_host):
# type: (str) -> None
@@ -62,11 +62,7 @@ def test_server_running(force: bool=False, external_host: str='testserver',
set_up_django(external_host)
if use_db:
generate_fixtures_command = ['tools/setup/generate-fixtures']
test_template_db_status = template_database_status()
if test_template_db_status == 'needs_rebuild':
generate_fixtures_command.append('--force')
subprocess.check_call(generate_fixtures_command)
run_generate_fixtures_if_required()
# Run this not through the shell, so that we have the actual PID.
run_dev_server_command = ['tools/run-dev.py', '--test']