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

Merge pull request #5875 from minrk/js_enabled

Browse Source 
fix undefined js_enabled on `iptest —all`
This commit is contained in:
Thomas Kluyver 2014-05-16 15:55:40 -07:00
commit 1ac6ee12a1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
IPython/testing/iptestcontroller.py
View File

@ -335,23 +335,22 @@ def prepare_controllers(options):
"""Returns two lists of TestController instances, those to run, and those
not to run."""
testgroups = options.testgroups
if testgroups:
py_testgroups = [g for g in testgroups if (g in py_test_group_names) \
or g.startswith('IPython.')]
if 'js' in testgroups:
js_testgroups = all_js_groups()
else:
js_testgroups = [g for g in testgroups if g not in py_testgroups]
js_enabled = len(js_testgroups) > 0
js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
py_testgroups = [g for g in testgroups if g not in ['js'] + js_testgroups]
else:
py_testgroups = py_test_group_names
js_testgroups = all_js_groups()
if not options.all:
js_enabled = False
js_testgroups = []
test_sections['parallel'].enabled = False
else:
js_testgroups = all_js_groups()
c_js = [JSController(name, js_enabled) for name in js_testgroups]
c_js = [JSController(name) for name in js_testgroups]
c_py = [PyTestController(name, options) for name in py_testgroups]
controllers = c_py + c_js