summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAttila Tovt <uran198@gmail.com>2016-01-02 08:44:33 +0200
committerAttila Tovt <uran198@gmail.com>2016-01-02 08:44:33 +0200
commit0db6367fe2aa6ab3fd152eacf172d57db45c1ffb (patch)
tree7bfe5f349768f1c027ad03d5800a9345e68d96e8
parent98839e906632dfe77c6f6906d61d62868a0541dc (diff)
Fixed #26008 -- Added parallel argument to paired_tests and bisect_tests
-rwxr-xr-xtests/runtests.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/runtests.py b/tests/runtests.py
index ced896987b..76e1ba4406 100755
--- a/tests/runtests.py
+++ b/tests/runtests.py
@@ -270,8 +270,8 @@ def django_tests(verbosity, interactive, failfast, keepdb, reverse,
return failures
-def bisect_tests(bisection_label, options, test_labels):
- state = setup(options.verbosity, test_labels)
+def bisect_tests(bisection_label, options, test_labels, parallel):
+ state = setup(options.verbosity, test_labels, parallel)
test_labels = test_labels or get_installed()
@@ -328,8 +328,8 @@ def bisect_tests(bisection_label, options, test_labels):
teardown(state)
-def paired_tests(paired_test, options, test_labels):
- state = setup(options.verbosity, test_labels)
+def paired_tests(paired_test, options, test_labels, parallel):
+ state = setup(options.verbosity, test_labels, parallel)
test_labels = test_labels or get_installed()
@@ -440,9 +440,9 @@ if __name__ == "__main__":
os.environ['DJANGO_SELENIUM_TESTS'] = '1'
if options.bisect:
- bisect_tests(options.bisect, options, options.modules)
+ bisect_tests(options.bisect, options, options.modules, options.parallel)
elif options.pair:
- paired_tests(options.pair, options, options.modules)
+ paired_tests(options.pair, options, options.modules, options.parallel)
else:
failures = django_tests(options.verbosity, options.interactive,
options.failfast, options.keepdb,