Merge pull request #7434 from takluyver/restore-test-all-js

Restore the ability to run all js tests with iptest js
ipython · Jan 13, 2015 · 098340c · 098340c
2 parents 77ebedc + 1b66a38
commit 098340c
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py
@@ -431,8 +431,11 @@ def prepare_controllers(options):
     not to run."""
     testgroups = options.testgroups
     if testgroups:
-        js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
-        py_testgroups = [g for g in testgroups if g not in js_testgroups]
+        if 'js' in testgroups:
+            js_testgroups = all_js_groups()
+        else:
+            js_testgroups = [g for g in testgroups if g.startswith(js_prefix)]
+        py_testgroups = [g for g in testgroups if not g.startswith('js')]
     else:
         py_testgroups = py_test_group_names
         if not options.all: