From 3854c832a08e9b30f3bfe613e4894ea1db1f2e39 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Mon, 26 Sep 2016 17:48:26 +0000 Subject: [PATCH] Change things so that the reorder_by setting has an effect on the test ordering. It didn't before, as CoverageTest was a subclass of the earlier entries in the reorder_by setting. - Legacy-Id: 12039 --- ietf/utils/test_runner.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ietf/utils/test_runner.py b/ietf/utils/test_runner.py index 759d94d28..917644ca3 100644 --- a/ietf/utils/test_runner.py +++ b/ietf/utils/test_runner.py @@ -45,6 +45,7 @@ import warnings import datetime import codecs import gzip +import unittest from coverage.report import Reporter from coverage.results import Numbers @@ -53,7 +54,6 @@ from optparse import make_option from django.conf import settings from django.template import TemplateDoesNotExist -from django.test import TestCase from django.test.runner import DiscoverRunner from django.core.management import call_command from django.core.urlresolvers import RegexURLResolver @@ -226,7 +226,7 @@ class CoverageReporter(Reporter): return result -class CoverageTest(TestCase): +class CoverageTest(unittest.TestCase): def __init__(self, test_runner=None, **kwargs): self.runner = test_runner @@ -507,7 +507,7 @@ class IetfTestRunner(DiscoverRunner): CoverageTest(test_runner=self, methodName='code_coverage_test'), ] - self.reorder_by += (CoverageTest, ) # see to it that the coverage tests come last + self.reorder_by += (unittest.TestCase, ) # see to it that the coverage tests come last failures = super(IetfTestRunner, self).run_tests(test_labels, extra_tests=extra_tests, **kwargs)