altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Tweaked the test runner to more consistently force the test coverage tests to be run last.

Browse source 
- Legacy-Id: 15030
This commit is contained in:
Henrik Levkowetz 2018-04-08 12:42:03 +00:00
parent ea7728b501
commit a96c6c4c5b
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
ietf/utils/test_runner.py
View file

@ -53,6 +53,7 @@ from coverage.results import Numbers
from coverage.misc import NotPython from coverage.misc import NotPython
from django.conf import settings from django.conf import settings
from django.contrib.staticfiles.testing import StaticLiveServerTestCase
from django.db.migrations.loader import MigrationLoader from django.db.migrations.loader import MigrationLoader
from django.db.migrations.operations.fields import FieldOperation from django.db.migrations.operations.fields import FieldOperation
from django.db.migrations.operations.models import ModelOperation from django.db.migrations.operations.models import ModelOperation
@ -68,9 +69,9 @@ debug.debug = True
import ietf import ietf
import ietf.utils.mail import ietf.utils.mail
from ietf.utils.test_smtpserver import SMTPTestServerDriver
from ietf.utils.test_utils import TestCase
from ietf.checks import maybe_create_svn_symlinks from ietf.checks import maybe_create_svn_symlinks
from ietf.utils.test_smtpserver import SMTPTestServerDriver
loaded_templates = set() loaded_templates = set()
visited_urls = set() visited_urls = set()
@ -263,7 +264,7 @@ class CoverageReporter(Reporter):
return result return result
class CoverageTest(TestCase): class CoverageTest(unittest.TestCase):
def __init__(self, test_runner=None, **kwargs): def __init__(self, test_runner=None, **kwargs):
self.runner = test_runner self.runner = test_runner
@ -629,6 +630,7 @@ class IetfTestRunner(DiscoverRunner):
def run_tests(self, test_labels, extra_tests=[], **kwargs): def run_tests(self, test_labels, extra_tests=[], **kwargs):
global old_destroy, old_create, test_database_name, template_coverage_collection global old_destroy, old_create, test_database_name, template_coverage_collection
from django.db import connection from django.db import connection
from ietf.doc.tests import TemplateTagTest
# Tests that involve switching back and forth between the real # Tests that involve switching back and forth between the real
# database and the test database are way too dangerous to run # database and the test database are way too dangerous to run
@ -657,7 +659,12 @@ class IetfTestRunner(DiscoverRunner):
CoverageTest(test_runner=self, methodName='code_coverage_test'), CoverageTest(test_runner=self, methodName='code_coverage_test'),
] ]
self.reorder_by += (unittest.TestCase, ) # see to it that the coverage tests come last # ensure that the coverage tests come last. Specifically list
# TemplateTagTest before CoverageTest. If this list contains
# parent classes to later subclasses, the parent classes will
# determine the ordering, so use the most specific classes
# necessary to get the right ordering:
self.reorder_by += (StaticLiveServerTestCase, TemplateTagTest, CoverageTest, )
failures = super(IetfTestRunner, self).run_tests(test_labels, extra_tests=extra_tests, **kwargs) failures = super(IetfTestRunner, self).run_tests(test_labels, extra_tests=extra_tests, **kwargs)