From 6c082b5539812c87ee045a63c89ccb286e5bc04e Mon Sep 17 00:00:00 2001 From: Kevin Kubasik Date: Tue, 9 Jun 2009 11:22:43 +0000 Subject: [PATCH] [soc2009/testing] Coverage reports are near feature-complete. Just need to finish my code cleanup tomorrow. Then start testing git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/test-improvements@10962 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/test/test_coverage.py | 11 ++++++----- tests/runtests.py | 3 ++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/django/test/test_coverage.py b/django/test/test_coverage.py index d52c39ddf2..56edbeda9f 100644 --- a/django/test/test_coverage.py +++ b/django/test/test_coverage.py @@ -30,14 +30,14 @@ class BaseCoverageRunner(object): Runs the specified tests while generating code coverage statistics. Upon the tests' completion, the results are printed to stdout. """ - coverage.erase() + #coverage.erase() #Allow an on-disk cache of coverage stats. #coverage.use_cache(0) for e in getattr(settings, 'COVERAGE_CODE_EXCLUDES', []): coverage.exclude(e) - coverage.start() brt = base_run_tests() + coverage.start() results = brt.run_tests(test_labels, verbosity, interactive, extra_tests) coverage.stop() @@ -71,7 +71,7 @@ class BaseCoverageRunner(object): for e in self.errors: print >> sys.stderr, e, print >> sys.stdout - coverage._the_coverage.save() + #coverage._the_coverage.save() return results @@ -83,6 +83,7 @@ class ReportingCoverageRunner(BaseCoverageRunner): Constructor, overrides BaseCoverageRunner. Sets output directory for reports. Parameter or setting. """ + super(ReportingCoverageRunner, self).__init__() if(outdir): self.outdir = outdir else: @@ -100,8 +101,8 @@ class ReportingCoverageRunner(BaseCoverageRunner): Overrides BaseCoverageRunner.run_tests, and adds html report generation with the results """ - res = BaseCoverageRunner.run_tests(self, *args, **kwargs) - coverage._the_coverage.load() + res = super(ReportingCoverageRunner, self).run_tests( *args, **kwargs) + #coverage._the_coverage.load() cov = coverage.html.HtmlReporter(coverage._the_coverage) cov.report(self.modules.values(), self.outdir) #coverage._the_coverage.html_report(self.modules.values(), self.outdir) diff --git a/tests/runtests.py b/tests/runtests.py index 5657259f1f..198c87aa10 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -156,7 +156,8 @@ def django_tests(verbosity, interactive, test_labels): from django.test.utils import get_runner if not hasattr(settings, 'TEST_RUNNER'): settings.TEST_RUNNER = 'django.test.simple.run_tests' - settings.COVERAGE_MODULE_EXCLUDES = ['modeltests', 'regressiontests', '__init__'] + settings.COVERAGE_MODULE_EXCLUDES = [] + #['modeltests', 'regressiontests'] settings.COVERAGE_CODE_EXCLUDES = ['def __unicode__\(self\):', 'def get_absolute_url\(self\):', ] settings.COVERAGE_ADDITIONAL_MODULES = ['django'] # 'from .* import .*', 'import .*',