paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-19 14:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't autoreload Tornado when running inside test suite.

Browse Source 
The restarted Tornado processes seemed to escape the process group and
thus continue running after run-dev.py finished.

While we're at it, we don't need to dump/reload event queues in the
test suite either.
This commit is contained in:
Tim Abbott
2016-04-12 19:28:49 -07:00
parent 98d5f64f36
commit ffccb572f0
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
zerver/lib/event_queue.py
View File

@@ -431,11 +431,12 @@ def send_restart_events(immediate=False):
client.add_event(event.copy()) client.add_event(event.copy())
def setup_event_queue(): def setup_event_queue():
load_event_queues() if not settings.TEST_SUITE:
atexit.register(dump_event_queues) load_event_queues()
# Make sure we dump event queues even if we exit via signal atexit.register(dump_event_queues)
signal.signal(signal.SIGTERM, lambda signum, stack: sys.exit(1)) # Make sure we dump event queues even if we exit via signal
tornado.autoreload.add_reload_hook(dump_event_queues) # type: ignore # TODO: Fix missing tornado.autoreload stub signal.signal(signal.SIGTERM, lambda signum, stack: sys.exit(1))
tornado.autoreload.add_reload_hook(dump_event_queues) # type: ignore # TODO: Fix missing tornado.autoreload stub
try: try:
os.rename(settings.JSON_PERSISTENT_QUEUE_FILENAME, "/var/tmp/event_queues.json.last") os.rename(settings.JSON_PERSISTENT_QUEUE_FILENAME, "/var/tmp/event_queues.json.last")