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

Add use_db flag to test_server_running().

Browse Source
This commit is contained in:
Steve Howell
2017-01-25 09:44:17 -08:00
committed by Tim Abbott
parent 38f5f3a76e
commit 5799183e10
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/lib/test_server.py
View File

@@ -52,8 +52,8 @@ def server_is_up(server, log_file):
return False
@contextmanager
def test_server_running(force=False, external_host='testserver', log_file=None, dots=False):
# type: (bool, str, str, bool) -> Iterator[None]
def test_server_running(force=False, external_host='testserver', log_file=None, dots=False, use_db=True):
# type: (bool, str, str, bool, bool) -> Iterator[None]
if log_file:
if os.path.exists(log_file) and os.path.getsize(log_file) < 100000:
log = open(log_file, 'a')
@@ -65,10 +65,11 @@ def test_server_running(force=False, external_host='testserver', log_file=None,
set_up_django(external_host)
generate_fixtures_command = ['tools/setup/generate-fixtures']
if not is_template_database_current():
generate_fixtures_command.append('--force')
subprocess.check_call(generate_fixtures_command)
if use_db:
generate_fixtures_command = ['tools/setup/generate-fixtures']
if not is_template_database_current():
generate_fixtures_command.append('--force')
subprocess.check_call(generate_fixtures_command)
# Run this not through the shell, so that we have the actual PID.
run_dev_server_command = ['tools/run-dev.py', '--test']