diff options
| -rw-r--r-- | coverage/nose_coverage.py | 7 | ||||
| -rw-r--r-- | coverage/testplugin.py | 5 | ||||
| -rw-r--r-- | setup.py | 3 |
3 files changed, 9 insertions, 6 deletions
diff --git a/coverage/nose_coverage.py b/coverage/nose_coverage.py index 907e6803..b2bf9b5a 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 7b8c0f43..4ff598a9 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) @@ -45,6 +45,9 @@ if sys.hexversion < 0x03000000: 'pytest11': [ 'coverage = coverage.testplugin', ], + 'nose.plugins.0.10': [ + 'coverage = coverage.nose_coverage:Coverage', + ], }, # We need to get HTML assets from our htmlfiles dir. |