Author: kkubasik
Date: 2009-06-09 06:22:43 -0500 (Tue, 09 Jun 2009)
New Revision: 10962
Modified:
django/branches/soc2009/test-improvements/django/test/test_coverage.py
django/branches/soc2009/test-improvements/tests/runtests.py
Log:
[soc2009/testing] Coverage reports are near feature-complete. Just need to
finish my code cleanup tomorrow. Then start testing
Modified: django/branches/soc2009/test-improvements/django/test/test_coverage.py
===================================================================
--- django/branches/soc2009/test-improvements/django/test/test_coverage.py
2009-06-09 11:22:19 UTC (rev 10961)
+++ django/branches/soc2009/test-improvements/django/test/test_coverage.py
2009-06-09 11:22:43 UTC (rev 10962)
@@ -30,14 +30,14 @@
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)
+ brt = base_run_tests()
coverage.start()
- brt = base_run_tests()
results = brt.run_tests(test_labels, verbosity, interactive,
extra_tests)
coverage.stop()
@@ -71,7 +71,7 @@
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 @@
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 @@
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)
Modified: django/branches/soc2009/test-improvements/tests/runtests.py
===================================================================
--- django/branches/soc2009/test-improvements/tests/runtests.py 2009-06-09
11:22:19 UTC (rev 10961)
+++ django/branches/soc2009/test-improvements/tests/runtests.py 2009-06-09
11:22:43 UTC (rev 10962)
@@ -156,7 +156,8 @@
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 .*',
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---