Show More
@@ -335,15 +335,13 b' def prepare_controllers(options):' | |||||
335 | """Returns two lists of TestController instances, those to run, and those |
|
335 | """Returns two lists of TestController instances, those to run, and those | |
336 | not to run.""" |
|
336 | not to run.""" | |
337 | testgroups = options.testgroups |
|
337 | testgroups = options.testgroups | |
338 | js_enabled = True |
|
|||
339 | if testgroups: |
|
338 | if testgroups: | |
340 | py_testgroups = [g for g in testgroups if (g in py_test_group_names) \ |
|
|||
341 | or g.startswith('IPython.')] |
|
|||
342 | if 'js' in testgroups: |
|
339 | if 'js' in testgroups: | |
343 | js_testgroups = all_js_groups() |
|
340 | js_testgroups = all_js_groups() | |
344 | else: |
|
341 | else: | |
345 |
js_testgroups = [g for g in testgroups if g |
|
342 | js_testgroups = [g for g in testgroups if g.startswith(js_prefix)] | |
346 | js_enabled = len(js_testgroups) > 0 |
|
343 | ||
|
344 | py_testgroups = [g for g in testgroups if g not in ['js'] + js_testgroups] | |||
347 | else: |
|
345 | else: | |
348 | py_testgroups = py_test_group_names |
|
346 | py_testgroups = py_test_group_names | |
349 | if not options.all: |
|
347 | if not options.all: | |
@@ -352,7 +350,7 b' def prepare_controllers(options):' | |||||
352 | else: |
|
350 | else: | |
353 | js_testgroups = all_js_groups() |
|
351 | js_testgroups = all_js_groups() | |
354 |
|
352 | |||
355 |
c_js = [JSController(name |
|
353 | c_js = [JSController(name) for name in js_testgroups] | |
356 | c_py = [PyTestController(name, options) for name in py_testgroups] |
|
354 | c_py = [PyTestController(name, options) for name in py_testgroups] | |
357 |
|
355 | |||
358 | controllers = c_py + c_js |
|
356 | controllers = c_py + c_js |
General Comments 0
You need to be logged in to leave comments.
Login now