Show More
@@ -22,7 +22,10 b' import subprocess' | |||||
22 | import time |
|
22 | import time | |
23 | import re |
|
23 | import re | |
24 |
|
24 | |||
25 | from .iptest import have, test_group_names as py_test_group_names, test_sections, StreamCapturer |
|
25 | from .iptest import ( | |
|
26 | have, test_group_names as py_test_group_names, test_sections, StreamCapturer, | |||
|
27 | test_for, | |||
|
28 | ) | |||
26 | from IPython.utils.path import compress_user |
|
29 | from IPython.utils.path import compress_user | |
27 | from IPython.utils.py3compat import bytes_to_str |
|
30 | from IPython.utils.py3compat import bytes_to_str | |
28 | from IPython.utils.sysinfo import get_sys_info |
|
31 | from IPython.utils.sysinfo import get_sys_info | |
@@ -288,7 +291,12 b' class JSController(TestController):' | |||||
288 |
|
291 | |||
289 | @property |
|
292 | @property | |
290 | def will_run(self): |
|
293 | def will_run(self): | |
291 |
|
|
294 | should_run = all(have[a] for a in self.requirements + [self.engine]) | |
|
295 | tornado4 = test_for('tornado.version_info', (4,0,0), callback=None) | |||
|
296 | if should_run and self.engine == 'phantomjs' and tornado4: | |||
|
297 | print("phantomjs cannot connect websockets to tornado 4", file=sys.stderr) | |||
|
298 | return False | |||
|
299 | return should_run | |||
292 |
|
300 | |||
293 | def _init_server(self): |
|
301 | def _init_server(self): | |
294 | "Start the notebook server in a separate process" |
|
302 | "Start the notebook server in a separate process" |
General Comments 0
You need to be logged in to leave comments.
Login now