mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-12 11:45:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't hang tests if notebook server fails to terminate.

Browse Source
This commit is contained in:
MinRK 2014-04-30 15:54:29 -07:00
parent 395c983377
commit b3c46ab2b4
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
IPython/testing/iptestcontroller.py
View File

@ -6,16 +6,9 @@ test suite.
""" """
#----------------------------------------------------------------------------- # Copyright (c) IPython Development Team.
# Copyright (C) 2009-2011 The IPython Development Team # Distributed under the terms of the Modified BSD License.
#
# Distributed under the terms of the BSD License. The full license is in
# the file COPYING, distributed as part of this software.
#-----------------------------------------------------------------------------
#-----------------------------------------------------------------------------
# Imports
#-----------------------------------------------------------------------------
from __future__ import print_function from __future__ import print_function
import argparse import argparse
@ -34,6 +27,7 @@ from IPython.utils.py3compat import bytes_to_str
from IPython.utils.sysinfo import get_sys_info from IPython.utils.sysinfo import get_sys_info
from IPython.utils.tempdir import TemporaryDirectory from IPython.utils.tempdir import TemporaryDirectory
NOTEBOOK_SHUTDOWN_TIMEOUT = 10
class TestController(object): class TestController(object):
"""Run tests in a subprocess """Run tests in a subprocess
@ -287,7 +281,27 @@ class JSController(TestController):
except OSError: except OSError:
# already dead # already dead
pass pass
self.server.wait() # wait 10s for the server to shutdown
try:
self.server.wait(NOTEBOOK_SHUTDOWN_TIMEOUT)
except subprocess.TimeoutExpired:
# server didn't terminate, kill it
try:
print("Failed to terminate notebook server, killing it.",
file=sys.stderr
)
self.server.kill()
except OSError:
# already dead
pass
# wait another 10s
try:
self.server.wait(NOTEBOOK_SHUTDOWN_TIMEOUT)
except subprocess.TimeoutExpired:
print("Notebook server still running (%s)" % self.server_info_file,
file=sys.stderr
)
self.stream_capturer.halt() self.stream_capturer.halt()
TestController.cleanup(self) TestController.cleanup(self)