diff --git a/django/test/test_coverage.py b/django/test/test_coverage.py index 791b4d097e..6570336bfc 100644 --- a/django/test/test_coverage.py +++ b/django/test/test_coverage.py @@ -6,7 +6,7 @@ from django.db.models import get_app, get_apps from django.test.simple import DefaultTestRunner as base_run_tests from django.utils.module_tools import get_all_modules -from django.test.coverage_report import html_report +#from django.test.coverage_report import html_report from django.utils.translation import ugettext as _ def _get_app_package(app_model_module): @@ -99,7 +99,7 @@ class ReportingCoverageRunner(BaseCoverageRunner): with the results """ res = BaseCoverageRunner.run_tests(self, *args, **kwargs) - html_report(self.outdir, self.modules, self.excludes, self.errors) + coverage._the_coverage.html_report(self.modules.values(), self.outdir) print >>sys.stdout print >>sys.stdout, _("HTML reports were output to '%s'") %self.outdir diff --git a/tests/runtests.py b/tests/runtests.py index 54c088b664..5657259f1f 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -160,9 +160,9 @@ def django_tests(verbosity, interactive, test_labels): settings.COVERAGE_CODE_EXCLUDES = ['def __unicode__\(self\):', 'def get_absolute_url\(self\):', ] settings.COVERAGE_ADDITIONAL_MODULES = ['django'] # 'from .* import .*', 'import .*', - test_runner = get_runner(settings, coverage=True) - - failures = test_runner(test_labels, verbosity=verbosity, interactive=interactive, extra_tests=extra_tests) + test_runner = get_runner(settings, coverage=True, reports=True) + tr = test_runner() + failures = tr.run_tests(test_labels, verbosity=verbosity, interactive=interactive, extra_tests=extra_tests) if failures: sys.exit(failures)