diff options
| author | Ned Batchelder <ned@nedbatchelder.com> | 2010-05-31 22:07:52 -0400 |
|---|---|---|
| committer | Ned Batchelder <ned@nedbatchelder.com> | 2010-05-31 22:07:52 -0400 |
| commit | 7bb1d77bd46523bc00028655553c3626cc922067 (patch) | |
| tree | 1b9f6ea392a4d3015d012dd0aadf2279c10fb4b0 | |
| parent | c87a147fb559b7f9c785ab57aeb350ab6fa9dcd8 (diff) | |
| download | python-coveragepy-git-7bb1d77bd46523bc00028655553c3626cc922067.tar.gz | |
Make include and omit work properly in the plugin.
| -rw-r--r-- | coverage/cmdline.py | 10 | ||||
| -rw-r--r-- | coverage/runners/noseplugin.py | 2 | ||||
| -rw-r--r-- | coverage/runners/plugin.py | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/coverage/cmdline.py b/coverage/cmdline.py index c96bba9a..d8738db7 100644 --- a/coverage/cmdline.py +++ b/coverage/cmdline.py @@ -440,12 +440,8 @@ class CoverageScript(object): return ERR # Listify the list options. - omit = None - if options.omit: - omit = pattern_list(options.omit) - include = None - if options.include: - include = pattern_list(options.include) + omit = pattern_list(options.omit) + include = pattern_list(options.include) # Do something. self.coverage = self.covpkg.coverage( @@ -534,6 +530,8 @@ class CoverageScript(object): def pattern_list(s): """Turn an argument into a list of patterns.""" + if not s: + return None if sys.platform == 'win32': # When running coverage as coverage.exe, some of the behavior # of the shell is emulated: wildcards are expanded into a list of diff --git a/coverage/runners/noseplugin.py b/coverage/runners/noseplugin.py index 79c4a465..930ef140 100644 --- a/coverage/runners/noseplugin.py +++ b/coverage/runners/noseplugin.py @@ -52,5 +52,5 @@ class Coverage(Plugin): """Output code coverage report.""" log.debug("Coverage report") - stream.write("Processing Coverage...") + stream.write("Processing Coverage...\n") self.coverage.finish(stream) diff --git a/coverage/runners/plugin.py b/coverage/runners/plugin.py index e0591bdf..26bc9e7b 100644 --- a/coverage/runners/plugin.py +++ b/coverage/runners/plugin.py @@ -87,11 +87,11 @@ class CoverageTestWrapper(object): options = [ - optparse.Option('--cover-rcfile', action='store', metavar="RC", + optparse.Option('--cover-rcfile', action='store', metavar="RCFILE", help="Specify configuration file. ['.coveragerc']", default=True), - optparse.Option('--cover-report', action='append', default=['report'], + optparse.Option('--cover-report', action='append', default=[], dest='cover_reports', type="choice", choices=['annotate', 'html', 'report', 'xml'], help=("Choose what coverage report(s) to create: " |