p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3730 from tchaumeny/test_suite_reorder 

Fixed #23992 -- Optimized reorder_suite functions using OrderedSet
This commit is contained in:
Aymeric Augustin 2014-12-14 17:29:34 +01:00
parent 9495989265 2ca0870b67
commit 0fc1882510
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
django/test/runner.py
View File

@ -7,6 +7,7 @@ from django.conf import settings
from django.core.exceptions import ImproperlyConfigured
from django.test import SimpleTestCase, TestCase
from django.test.utils import setup_test_environment, teardown_test_environment
from django.utils.datastructures import OrderedSet
class DiscoverRunner(object):
@ -231,11 +232,12 @@ def reorder_suite(suite, classes, reverse=False):
"""
class_count = len(classes)
suite_class = type(suite)
bins = [suite_class() for i in range(class_count + 1)]
bins = [OrderedSet() for i in range(class_count + 1)]
partition_suite(suite, classes, bins, reverse=reverse)
for i in range(class_count):
bins[0].addTests(bins[i + 1])
return bins[0]
reordered_suite = suite_class()
for i in range(class_count + 1):
reordered_suite.addTests(bins[i])
return reordered_suite
def partition_suite(suite, classes, bins, reverse=False):
@ -258,12 +260,10 @@ def partition_suite(suite, classes, bins, reverse=False):
else:
for i in range(len(classes)):
if isinstance(test, classes[i]):
if test not in bins[i]:
bins[i].addTest(test)
bins[i].add(test)
break
else:
if test not in bins[-1]:
bins[-1].addTest(test)
bins[-1].add(test)
def setup_databases(verbosity, interactive, keepdb=False, **kwargs):