Django/django
11
0
Fork 0
Code Pull Requests Projects Releases Activity

[1.9.x] Fixed #26008 -- Added parallel argument to paired_tests and bisect_tests

Browse Source 
Backport of 0db6367fe2aa6ab3fd152eacf172d57db45c1ffb from master
This commit is contained in:
Attila Tovt 2016-01-02 08:44:33 +02:00 committed by Tim Graham
parent 5855bee1d1
commit 151027beab
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/runtests.py
View File

@ -278,8 +278,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()
@ -336,8 +336,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()
@ -448,9 +448,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,