summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNed Batchelder <ned@nedbatchelder.com>2010-05-30 11:30:55 -0400
committerNed Batchelder <ned@nedbatchelder.com>2010-05-30 11:30:55 -0400
commitc03628367b660ff2b52d6f88105fda75e5b080c8 (patch)
tree2a7697356316ccd52ce0b1f9b7ae861c81bdfd64
parentb1a44a1f52f048727eb8064da3d70a43a3cbbcd2 (diff)
downloadpython-coveragepy-git-c03628367b660ff2b52d6f88105fda75e5b080c8.tar.gz
Move the test runner plugins into their own sub-package.
--HG-- rename : coverage/noseplugin.py => coverage/runners/noseplugin.py rename : coverage/testplugin.py => coverage/runners/pytestplugin.py
-rw-r--r--TODO.txt3
-rw-r--r--coverage/runners/__init__.py0
-rw-r--r--coverage/runners/noseplugin.py (renamed from coverage/noseplugin.py)2
-rw-r--r--coverage/runners/pytestplugin.py (renamed from coverage/testplugin.py)0
-rw-r--r--setup.py4
-rw-r--r--test/test_testplugin.py2
6 files changed, 7 insertions, 4 deletions
diff --git a/TODO.txt b/TODO.txt
index d7aefdd0..307f7d52 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -1,5 +1,8 @@
Coverage TODO
+* plugin work
+ - add --include.
+
* 3.3
- Config file
diff --git a/coverage/runners/__init__.py b/coverage/runners/__init__.py
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/coverage/runners/__init__.py
diff --git a/coverage/noseplugin.py b/coverage/runners/noseplugin.py
index 9e254ea1..20e73730 100644
--- a/coverage/noseplugin.py
+++ b/coverage/runners/noseplugin.py
@@ -1,7 +1,7 @@
import logging
from nose.plugins import Plugin
-from coverage.testplugin import CoverageTestWrapper, options as coverage_opts
+from coverage.runners.pytestplugin import CoverageTestWrapper, options as coverage_opts
log = logging.getLogger(__name__)
diff --git a/coverage/testplugin.py b/coverage/runners/pytestplugin.py
index 57833005..57833005 100644
--- a/coverage/testplugin.py
+++ b/coverage/runners/pytestplugin.py
diff --git a/setup.py b/setup.py
index e8aa3341..399aacc6 100644
--- a/setup.py
+++ b/setup.py
@@ -82,10 +82,10 @@ setup_args = dict(
'coverage = coverage:main',
],
'pytest11': [
- 'coverage = coverage.testplugin',
+ 'coverage = coverage.runners.pytestplugin',
],
'nose.plugins.0.10': [
- 'coverage = coverage.noseplugin:Coverage',
+ 'coverage = coverage.runners.noseplugin:Coverage',
],
},
diff --git a/test/test_testplugin.py b/test/test_testplugin.py
index 87e2e4bc..98459f53 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.noseplugin import Coverage
+from coverage.runners.noseplugin import Coverage
class TestCoverage(PluginTester, unittest.TestCase):
activate = '--with-coverage' # enables the plugin