[py-svn] r62133 - in py/branch/pytestplugin/py/test: . plugin testing
hpk at codespeak.net
hpk at codespeak.net
Wed Feb 25 11:35:21 CET 2009
Author: hpk
Date: Wed Feb 25 11:35:21 2009
New Revision: 62133
Modified:
py/branch/pytestplugin/py/test/config.py
py/branch/pytestplugin/py/test/plugin/pytest_apigen.py
py/branch/pytestplugin/py/test/plugin/pytest_eventlog.py
py/branch/pytestplugin/py/test/plugin/pytest_plugintester.py
py/branch/pytestplugin/py/test/plugin/pytest_pocoo.py
py/branch/pytestplugin/py/test/plugin/pytest_resultlog.py
py/branch/pytestplugin/py/test/plugin/pytest_terminal.py
py/branch/pytestplugin/py/test/pytestplugin.py
py/branch/pytestplugin/py/test/testing/test_pytestplugin.py
Log:
normalizing for "pytest_addoption" hook.
Modified: py/branch/pytestplugin/py/test/config.py
==============================================================================
--- py/branch/pytestplugin/py/test/config.py (original)
+++ py/branch/pytestplugin/py/test/config.py Wed Feb 25 11:35:21 2009
@@ -53,7 +53,7 @@
#print "parse, seeing pytestplugins", self.pytestplugins.pyplugins
#self.pytestplugins.setinitial(self._conftest.getconftestmodules(None))
#print "plugins", self.pytestplugins.pyplugins.list
- self.pytestplugins.add_cmdlineoptions(self)
+ self.pytestplugins.do_addoption(self)
args = [str(x) for x in args]
cmdlineoption, args = self._parser.parse_args(args)
self.option.__dict__.update(vars(cmdlineoption))
Modified: py/branch/pytestplugin/py/test/plugin/pytest_apigen.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_apigen.py (original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_apigen.py Wed Feb 25 11:35:21 2009
@@ -1,13 +1,10 @@
import py
class ApigenPlugin:
- pytest_cmdlineoptions = [
- py.test.config.Option(
- '--apigen',
- action="store_true", dest="apigen",
- help="generate api documentation")
+ def pytest_addoption(self, config):
+ config.addoption('--apigen', action="store_true", dest="apigen",
+ help="generate api documentation")
# "--apigen-script" argument pointing to a script"),
- ]
def pytest_configure(self, config):
if config.option.apigen:
Modified: py/branch/pytestplugin/py/test/plugin/pytest_eventlog.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_eventlog.py (original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_eventlog.py Wed Feb 25 11:35:21 2009
@@ -2,15 +2,10 @@
class EventlogPlugin:
""" log pytest events to a file. """
- def pytest_option(self, config):
+ def pytest_addoption(self, config):
config.addoption("--eventlog", dest="eventlog",
help="write all pytest events to the given file.")
- pytest_cmdlineoptions = [
- py.test.config.Option('--eventlog', dest="eventlog",
- help="write all pytest events to a specific file")
- ]
-
def pytest_configure(self, config):
eventlog = config.option.eventlog
if eventlog:
Modified: py/branch/pytestplugin/py/test/plugin/pytest_plugintester.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_plugintester.py (original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_plugintester.py Wed Feb 25 11:35:21 2009
@@ -94,9 +94,7 @@
def __init__(self):
""" usually called only once per test process. """
- pytest_cmdlineoptions = []
-
- def pytest_option(self, config):
+ def pytest_addoption(self, config):
""" called before commandline parsing. """
def pytest_configure(self, config):
Modified: py/branch/pytestplugin/py/test/plugin/pytest_pocoo.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_pocoo.py (original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_pocoo.py Wed Feb 25 11:35:21 2009
@@ -10,11 +10,11 @@
class PocooPlugin(object):
""" report URLs from sending test failures to the http://paste.pocoo.org service. """
- pytest_cmdlineoptions = [
- py.test.config.Option('--pocoo-sendfailures',
+
+ def pytest_addoption(self, config):
+ config.addoption('--pocoo-sendfailures',
action='store_true', dest="pocoo_sendfailures",
help="send failures to %s" %(url.base,))
- ]
def getproxy(self):
return py.std.xmlrpclib.ServerProxy(url.xmlrpc).pastes
Modified: py/branch/pytestplugin/py/test/plugin/pytest_resultlog.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_resultlog.py (original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_resultlog.py Wed Feb 25 11:35:21 2009
@@ -4,10 +4,10 @@
"""resultlog plugin for machine-readable logging of test results.
Useful for buildbot integration code.
"""
- pytest_cmdlineoptions = [
- py.test.config.Option('--resultlog', action="store", dest="resultlog", default=None,
+ def pytest_addoption(self, config):
+ config.addoption('--resultlog', action="store", dest="resultlog",
help="path for machine-readable result log")
- ]
+
def pytest_configure(self, config):
resultlog = config.option.resultlog
if resultlog:
Modified: py/branch/pytestplugin/py/test/plugin/pytest_terminal.py
==============================================================================
--- py/branch/pytestplugin/py/test/plugin/pytest_terminal.py (original)
+++ py/branch/pytestplugin/py/test/plugin/pytest_terminal.py Wed Feb 25 11:35:21 2009
@@ -3,12 +3,11 @@
class TerminalPlugin(object):
""" Report a test run to a terminal. """
- pytest_cmdlineoptions = [
- py.test.config.Option('', '--collectonly',
+ def pytest_addoption(self, config):
+ config.addoption('--collectonly',
action="store_true", dest="collectonly",
- default=False,
help="only collect tests, don't execute them."),
- ]
+
def pytest_configure(self, config):
if config.option.collectonly:
self.reporter = CollectonlyReporter(config)
Modified: py/branch/pytestplugin/py/test/pytestplugin.py
==============================================================================
--- py/branch/pytestplugin/py/test/pytestplugin.py (original)
+++ py/branch/pytestplugin/py/test/pytestplugin.py Wed Feb 25 11:35:21 2009
@@ -76,16 +76,8 @@
def notify(self, eventname, *args, **kwargs):
return self.pyplugins.notify(eventname, *args, **kwargs)
- def do_option(self, config):
- self.pyplugins.call_each('pytest_option', config=config)
-
- def add_cmdlineoptions(self, config):
- # XXX think about sorting/grouping of options from user-perspective
- #assert self.pyplugins.list
- opts = []
- for options in self.pyplugins.listattr("pytest_cmdlineoptions"):
- opts.extend(options)
- config.addoptions("ungrouped options added by plugins", *opts)
+ def do_addoption(self, config):
+ self.pyplugins.call_each('pytest_addoption', config=config)
def pyevent_plugin_registered(self, plugin):
if hasattr(self, '_config'):
Modified: py/branch/pytestplugin/py/test/testing/test_pytestplugin.py
==============================================================================
--- py/branch/pytestplugin/py/test/testing/test_pytestplugin.py (original)
+++ py/branch/pytestplugin/py/test/testing/test_pytestplugin.py Wed Feb 25 11:35:21 2009
@@ -145,13 +145,12 @@
from py.__.test.config import Config
p = testdir.makepyfile("""
class ConftestPlugin:
- def pytest_option(self, config):
+ def pytest_addoption(self, config):
config.addoption('--test123', action="store_true")
""")
config = Config()
config._conftest.importconftest(p)
print config.pytestplugins.getplugins()
- config.pytestplugins.do_option(config=config)
config.parse([])
assert not config.option.test123
More information about the pytest-commit
mailing list