From 07cc3b6945f600ef84d83367cf9c7a034d2e9865 Mon Sep 17 00:00:00 2001 From: David Stanek Date: Sat, 20 Feb 2010 19:36:21 -0500 Subject: moved the nose plugin to a better name --- coverage/nose_coverage.py | 67 ----------------------------------------------- coverage/noseplugin.py | 67 +++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 2 +- test/test_testplugin.py | 2 +- 4 files changed, 69 insertions(+), 69 deletions(-) delete mode 100644 coverage/nose_coverage.py create mode 100644 coverage/noseplugin.py diff --git a/coverage/nose_coverage.py b/coverage/nose_coverage.py deleted file mode 100644 index b2bf9b5..0000000 --- a/coverage/nose_coverage.py +++ /dev/null @@ -1,67 +0,0 @@ -import logging -import unittest, os -from nose.plugins import Plugin -import sys - -from coverage.testplugin import CoverageTestWrapper, options as coverage_opts - -log = logging.getLogger(__name__) - - -class Coverage(Plugin): - """ - Activate a coverage report using Ned Batchelder's coverage module. - """ - - name = "coverage_new" - score = 1 - status = {} - - def options(self, parser, env): - """ - Add options to command line. - """ - Plugin.options(self, parser, env) - for opt in coverage_opts: - parser.add_option(opt) - - def configure(self, options, config): - """ - Configure plugin. - """ - try: - self.status.pop('active') - except KeyError: - pass - Plugin.configure(self, options, config) - if self.enabled: - try: - import coverage - except ImportError: - log.error("Coverage not available: " - "unable to import coverage module") - self.enabled = False - return - - self.config = config - self.status['active'] = True - self.options = options - - def begin(self): - """ - Begin recording coverage information. - """ - log.debug("Coverage begin") - # Load the runner and start it up - self.coverage = CoverageTestWrapper(self.options) - self.coverage.start() - - def report(self, stream): - """ - Output code coverage report. - """ - log.debug("Coverage report") - stream.write("Processing Coverage...") - # finish up with coverage - self.coverage.finish(stream) - diff --git a/coverage/noseplugin.py b/coverage/noseplugin.py new file mode 100644 index 0000000..b2bf9b5 --- /dev/null +++ b/coverage/noseplugin.py @@ -0,0 +1,67 @@ +import logging +import unittest, os +from nose.plugins import Plugin +import sys + +from coverage.testplugin import CoverageTestWrapper, options as coverage_opts + +log = logging.getLogger(__name__) + + +class Coverage(Plugin): + """ + Activate a coverage report using Ned Batchelder's coverage module. + """ + + name = "coverage_new" + score = 1 + status = {} + + def options(self, parser, env): + """ + Add options to command line. + """ + Plugin.options(self, parser, env) + for opt in coverage_opts: + parser.add_option(opt) + + def configure(self, options, config): + """ + Configure plugin. + """ + try: + self.status.pop('active') + except KeyError: + pass + Plugin.configure(self, options, config) + if self.enabled: + try: + import coverage + except ImportError: + log.error("Coverage not available: " + "unable to import coverage module") + self.enabled = False + return + + self.config = config + self.status['active'] = True + self.options = options + + def begin(self): + """ + Begin recording coverage information. + """ + log.debug("Coverage begin") + # Load the runner and start it up + self.coverage = CoverageTestWrapper(self.options) + self.coverage.start() + + def report(self, stream): + """ + Output code coverage report. + """ + log.debug("Coverage report") + stream.write("Processing Coverage...") + # finish up with coverage + self.coverage.finish(stream) + diff --git a/setup.py b/setup.py index 37f9681..6a607d4 100644 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ if sys.hexversion < 0x03000000: 'coverage = coverage.testplugin', ], 'nose.plugins.0.10': [ - 'coverage = coverage.nose_coverage:Coverage', + 'coverage = coverage.noseplugin:Coverage', ], }, diff --git a/test/test_testplugin.py b/test/test_testplugin.py index d102a4f..c216ead 100644 --- a/test/test_testplugin.py +++ b/test/test_testplugin.py @@ -1,7 +1,7 @@ import py import unittest from nose.plugins import PluginTester -from coverage.nose_coverage import Coverage +from coverage.noseplugin import Coverage class TestCoverage(PluginTester, unittest.TestCase): activate = '--with-coverage_new' # enables the plugin -- cgit v1.2.1