[py-svn] pytest-coverage commit dac090ea7327: pytest_coverage.py: Changed --cover-action to --cover-report (more meaningful ihmo - as in - report_type), also the dest for this option conflicted with py.test's --report option. Changed --cover-package to just --cover, use this to test if we should load the plugin or not.

[commits-noreply at bitbucket.org]

# HG changeset patch -- Bitbucket.org
# Project pytest-coverage
# URL http://bitbucket.org/prologic/pytest-coverage/overview/
# User prologic
# Date 1265879398 -36000
# Node ID dac090ea73279920077fa4243d21a6ce18cfb322
# Parent b18c6cf598dbe27aa6f8c2115c9ea5837df82e55
pytest_coverage.py: Changed --cover-action to --cover-report (more meaningful ihmo - as in - report_type), also the dest for this option conflicted with py.test's --report option. Changed --cover-package to just --cover, use this to test if we should load the plugin or not.

--- a/pytest_coverage.py
+++ b/pytest_coverage.py
@@ -9,8 +9,11 @@ import sys, py
 
 def pytest_addoption(parser):
     group = parser.getgroup('Coverage options')
-    group.addoption('--cover-action', action='store', default=None,
-            dest='coverage', type="choice", 
+    group.addoption('--cover', action='append', default=[],
+            dest='coverpackages',
+            help='(multi allowed) only include info from specified package.')
+    group.addoption('--cover-report', action='store', default="report",
+            dest='report_type', type="choice", 
             choices=['report', 'annotate', 'html'],
             help="""
                 html: Directory for html output
@@ -23,10 +26,6 @@ def pytest_addoption(parser):
     group.addoption('--cover-show-missing', action='store', default=None,
             dest='show_missing',
             help='Show missing files')
-    group.addoption('--cover-package', action='append', default=[],
-            dest='coverpackages',
-            help='(multi allowed) only include info from specified package.')
-
     group.addoption('--cover-ignore-errors', action='store', default=None,
             dest='ignore_errors', 
             help='Ignore errors')
@@ -35,7 +34,7 @@ def pytest_addoption(parser):
             help='File with coverage files to omit')
 
 def pytest_configure(config):
-    if config.getvalue("coverage"):
+    if config.getvalue("coverpackages"):
         config.pluginmanager.register(DoCoverage(config), "docoverage")
 
 class DoCoverage:
@@ -59,7 +58,7 @@ class DoCoverage:
         
         show_missing = config.getvalue('show_missing')
         omit = config.getvalue('omit')
-        report = config.getvalue('report') or 'report'
+        report_type = config.getvalue('report_type') or 'report_type'
         directory = config.getvalue('directory') or 'coverage'
 
         
@@ -87,10 +86,10 @@ class DoCoverage:
             except:
                 pass
         
-        if report == 'report':
+        if report_type == 'report':
             self.cov.report(show_missing=show_missing, **report_args)
-        if report == 'annotate':
-            self.cov.annotate(directory=directory, **report_args)
-        if report == 'html':
+        elif report_type == 'annotate':
+            self.cov.annotate(directory=directory, **report_type)
+        elif report_type == 'html':
             self.cov.html_report(directory=directory, **report_args)