From 1c0c5e5b0fae7db9764e06ab023de550ba8644a0 Mon Sep 17 00:00:00 2001 From: Thomas Kluyver Date: Mon, 12 Jan 2015 15:22:23 -0800 Subject: [PATCH] Restore the ability to run all js tests with iptest js E.g. for slimer --- IPython/testing/iptestcontroller.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/IPython/testing/iptestcontroller.py b/IPython/testing/iptestcontroller.py index 87b2459ad..cd313e259 100644 --- 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: