diff options
| author | David Stanek <dstanek@dstanek.com> | 2010-02-20 18:36:25 -0500 |
|---|---|---|
| committer | David Stanek <dstanek@dstanek.com> | 2010-02-20 18:36:25 -0500 |
| commit | db9a63f43c8d0c2aa83c64c6e5b314797e9486c8 (patch) | |
| tree | a99a511d7f90dbaf05b5368c023040084e5c6590 /coverage | |
| parent | ab747f7c2f3bb2e9ca5d88e78b9bac5284466187 (diff) | |
| download | python-coveragepy-db9a63f43c8d0c2aa83c64c6e5b314797e9486c8.tar.gz | |
fixed busted nose integration
Diffstat (limited to 'coverage')
| -rw-r--r-- | coverage/nose_coverage.py | 7 | ||||
| -rw-r--r-- | coverage/testplugin.py | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/coverage/nose_coverage.py b/coverage/nose_coverage.py index 907e680..b2bf9b5 100644 --- a/coverage/nose_coverage.py +++ b/coverage/nose_coverage.py @@ -3,7 +3,7 @@ import unittest, os from nose.plugins import Plugin import sys -from coverage.testplugin import CoverageTestWrapper +from coverage.testplugin import CoverageTestWrapper, options as coverage_opts log = logging.getLogger(__name__) @@ -22,8 +22,7 @@ class Coverage(Plugin): Add options to command line. """ Plugin.options(self, parser, env) - from coverage.runner import options - for opt in options: + for opt in coverage_opts: parser.add_option(opt) def configure(self, options, config): @@ -64,5 +63,5 @@ class Coverage(Plugin): log.debug("Coverage report") stream.write("Processing Coverage...") # finish up with coverage - self.coverage.finish() + self.coverage.finish(stream) diff --git a/coverage/testplugin.py b/coverage/testplugin.py index 7b8c0f4..4ff598a 100644 --- a/coverage/testplugin.py +++ b/coverage/testplugin.py @@ -49,7 +49,7 @@ class CoverageTestWrapper(object): # Run the script. self.coverage.start() - def finish(self): + def finish(self, stream=None): # end coverage and save the results self.coverage.stop() self.coverage.save() @@ -76,7 +76,8 @@ class CoverageTestWrapper(object): if 'report' in self.options.cover_actions: self.coverage.report( - show_missing=self.options.cover_show_missing, **report_args) + show_missing=self.options.cover_show_missing, + file=stream, **report_args) if 'annotate' in self.options.cover_actions: self.coverage.annotate( directory=self.options.cover_directory, **report_args) |