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

Make sure tests aren't included twice as js and python
ipython · Jan 9, 2015 · 351430c · 351430c
2 parents 62757cf + a78564e
commit 351430c
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
@@ -431,9 +431,8 @@ def prepare_controllers(options):
     not to run."""
     testgroups = options.testgroups
     if testgroups:
-        alljs = all_js_groups()
         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:
         py_testgroups = py_test_group_names
         if not options.all: