Merge pull request #7405 from jhamrick/fix-js-tests

Make sure tests aren't included twice as js and python
This commit is contained in:
Thomas Kluyver 2015-01-09 13:50:01 -08:00
commit 632b423752

View File

@ -431,9 +431,8 @@ def prepare_controllers(options):
not to run.""" not to run."""
testgroups = options.testgroups testgroups = options.testgroups
if testgroups: if testgroups:
alljs = all_js_groups()
js_testgroups = [g for g in testgroups if g.startswith(js_prefix)] js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
py_testgroups = [g for g in testgroups if g not in alljs] py_testgroups = [g for g in testgroups if g not in js_testgroups]
else: else:
py_testgroups = py_test_group_names py_testgroups = py_test_group_names
if not options.all: if not options.all: