merging/unifying test plugin code

* coverage/testplugin.py contains common test plugin options
  and pytest hooks (which don't induce "import py")
* coverage/nose_coverage.py contains a basic Nose Plugin
* test/test_testplugin.py contains a pytest-functional test
  and a nose-skeleton one.  skipped as appropriate.

3 files changed, 56 insertions, 116 deletions

diff --git a/coverage/nose_coverage.py b/coverage/nose_coverage.py
index 6ba0a10..907e680 100644
--- a/coverage/nose_coverage.py
+++ b/coverage/nose_coverage.py
@@ -1,10 +1,9 @@
 import logging
 import unittest, os
-from nose.plugins import Plugin, PluginTester
-
+from nose.plugins import Plugin
 import sys
-import os
-sys.path.insert(0, os.path.realpath(os.path.join(os.path.dirname(__file__), '../../')))
+
+from coverage.testplugin import CoverageTestWrapper
 
 log = logging.getLogger(__name__)
 
@@ -55,7 +54,6 @@ class Coverage(Plugin):
         """
         log.debug("Coverage begin")
         # Load the runner and start it up
-        from coverage.runner import CoverageTestWrapper
         self.coverage = CoverageTestWrapper(self.options)
         self.coverage.start()
         
@@ -68,39 +66,3 @@ class Coverage(Plugin):
         # finish up with coverage
         self.coverage.finish()
 
-
-# Monkey patch omit_filter to use regex patterns for file omits
-def omit_filter(omit_prefixes, code_units):
-    import re
-    exclude_patterns = [re.compile(line.strip()) for line in omit_prefixes if line and not line.startswith('#')]
-    filtered = []
-    for cu in code_units:
-        skip = False
-        for pattern in exclude_patterns:
-            if pattern.search(cu.filename):
-                skip = True
-                break
-            
-        if not skip:
-            filtered.append(cu)
-    return filtered
-
-try:
-    import coverage
-    coverage.codeunit.omit_filter = omit_filter
-except:
-    pass
-
-class TestCoverage(PluginTester, unittest.TestCase):
-    activate = '--with-coverage_new' # enables the plugin
-    plugins = [Coverage()]
-    args = ['--cover-action=report']
-    
-    def test_output(self):
-        assert "Processing Coverage..." in self.output, (
-                                        "got: %s" % self.output)
-    def makeSuite(self):
-        class TC(unittest.TestCase):
-            def runTest(self):
-                raise ValueError("Coverage down")
-        return unittest.TestSuite([TC()])
diff --git a/coverage/pytest_coverage.py b/coverage/pytest_coverage.py
deleted file mode 100644
index 094be44..0000000
--- a/coverage/pytest_coverage.py
+++ /dev/null
@@ -1,74 +0,0 @@
-"""
-Write and report coverage data with 'coverage.py'. 
-"""
-import py
-import coverage
-
-def pytest_addoption(parser):
-    """
-    Get all the options from the coverage.runner and import them
-    """
-    from coverage.runner import options
-    group = parser.getgroup('Coverage options')
-    for opt in options:
-        group._addoption_instance(opt)
-
-def pytest_configure(config):
-    # Load the runner and start it up
-    if config.getvalue("cover_actions"):
-        config.pluginmanager.register(DoCover(config), "do_coverage")
-
-class DoCover:
-    def __init__(self, config):
-        self.config = config
-
-    def pytest_sessionstart(self):
-        from coverage.runner import CoverageTestWrapper
-        self.coverage = CoverageTestWrapper(self.config.option)
-        # XXX maybe better to start/suspend/resume coverage
-        # for each single test item
-        self.coverage.start()
-
-    def pytest_terminal_summary(self, terminalreporter):
-        # Finished the tests start processing the coverage
-        config = terminalreporter.config
-        tw = terminalreporter._tw
-        tw.sep('-', 'coverage')
-        tw.line('Processing Coverage...')
-        self.coverage.finish()
-       
-
-# Monkey patch omit_filter to use regex patterns for file omits
-def omit_filter(omit_prefixes, code_units):
-    import re
-    exclude_patterns = [re.compile(line.strip()) for line in omit_prefixes if line and not line.startswith('#')]
-    filtered = []
-    for cu in code_units:
-        skip = False
-        for pattern in exclude_patterns:
-            if pattern.search(cu.filename):
-                skip = True
-                break
-            
-        if not skip:
-            filtered.append(cu)
-    return filtered
-
-coverage.codeunit.omit_filter = omit_filter
-
-pytest_plugins = ['pytester']
-def test_functional(testdir):
-    testdir.makepyfile("""
-        def f():    
-            x = 42
-        def test_whatever():
-            pass
-        """)
-    result = testdir.runpytest("--cover-action=annotate")
-    assert result.ret == 0
-    assert result.stdout.fnmatch_lines([
-        '*Processing Coverage*'
-        ])
-    coveragefile = testdir.tmpdir.join(".coverage")
-    assert coveragefile.check()
-    # XXX try loading it? 
diff --git a/coverage/runner.py b/coverage/testplugin.py
index ef4c1f2..a979ad2 100644
--- a/coverage/runner.py
+++ b/coverage/testplugin.py
@@ -1,4 +1,4 @@
-import optparse
+import coverage, optparse
 
 class CoverageTestWrapper(object):
     """
@@ -136,3 +136,55 @@ xml         Create an XML report of coverage results.
         )
 ]
 
+# py.test plugin hooks
+
+def pytest_addoption(parser):
+    """
+    Get all the options from the coverage.runner and import them
+    """
+    group = parser.getgroup('Coverage options')
+    for opt in options:
+        group._addoption_instance(opt)
+
+def pytest_configure(config):
+    # Load the runner and start it up
+    if config.getvalue("cover_actions"):
+        config.pluginmanager.register(DoCover(config), "do_coverage")
+
+class DoCover:
+    def __init__(self, config):
+        self.config = config
+
+    def pytest_sessionstart(self):
+        self.coverage = CoverageTestWrapper(self.config.option)
+        # XXX maybe better to start/suspend/resume coverage
+        # for each single test item
+        self.coverage.start()
+
+    def pytest_terminal_summary(self, terminalreporter):
+        # Finished the tests start processing the coverage
+        config = terminalreporter.config
+        tw = terminalreporter._tw
+        tw.sep('-', 'coverage')
+        tw.line('Processing Coverage...')
+        self.coverage.finish()
+       
+
+# XXX please make the following unnessary
+# Monkey patch omit_filter to use regex patterns for file omits
+def omit_filter(omit_prefixes, code_units):
+    import re
+    exclude_patterns = [re.compile(line.strip()) for line in omit_prefixes if line and not line.startswith('#')]
+    filtered = []
+    for cu in code_units:
+        skip = False
+        for pattern in exclude_patterns:
+            if pattern.search(cu.filename):
+                skip = True
+                break
+            
+        if not skip:
+            filtered.append(cu)
+    return filtered
+
+coverage.codeunit.omit_filter = omit_filter