Merge latest code from main coverage.py repo

1 files changed, 36 insertions, 0 deletions

diff --git a/test/test_testplugin.py b/test/test_testplugin.py
new file mode 100644
index 0000000..87e2e4b
--- /dev/null
+++ b/test/test_testplugin.py
@@ -0,0 +1,36 @@
+import py
+import unittest
+from nose.plugins import PluginTester
+from coverage.noseplugin import Coverage
+
+class TestCoverage(PluginTester, unittest.TestCase):
+    activate = '--with-coverage' # enables the plugin
+    plugins = [Coverage()]
+    args = ['--cover-action=report']
+
+    @py.test.mark.skipif(True) # "requires nose test runner"
+    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()])
+
+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?