From 1764555778d7125697e9a5edbe1260b3b155f466 Mon Sep 17 00:00:00 2001 From: hpk Date: Sun, 1 Mar 2009 14:56:29 +0100 Subject: [PATCH] [svn r62292] use prefix "do_" for configure/unconfigure calls to plugins in addition to addoption. --HG-- branch : trunk --- py/test/cmdline.py | 4 ++-- py/test/dsession/masterslave.py | 2 +- py/test/dsession/testing/test_dsession.py | 2 +- py/test/looponfail/remote.py | 2 +- py/test/plugin/pytest_default.py | 2 +- py/test/plugin/pytest_pytester.py | 12 ++++++------ py/test/pytestplugin.py | 4 ++-- py/test/testing/test_pytestplugin.py | 6 +++--- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/py/test/cmdline.py b/py/test/cmdline.py index f4e555f8c..a48bce0bb 100644 --- a/py/test/cmdline.py +++ b/py/test/cmdline.py @@ -10,10 +10,10 @@ def main(args=None): args = py.std.sys.argv[1:] config = py.test.config config.parse(args) - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) session = config.initsession() exitstatus = session.main() - config.pytestplugins.unconfigure(config) + config.pytestplugins.do_unconfigure(config) raise SystemExit(exitstatus) def warn_about_missing_assertion(): diff --git a/py/test/dsession/masterslave.py b/py/test/dsession/masterslave.py index 382b780c3..6b593db97 100644 --- a/py/test/dsession/masterslave.py +++ b/py/test/dsession/masterslave.py @@ -113,7 +113,7 @@ class SlaveNode(object): self.channel.send((eventname, args, kwargs)) def run(self): - self.config.pytestplugins.configure(self.config) + self.config.pytestplugins.do_configure(self.config) from py.__.test.dsession.hostmanage import makehostup channel = self.channel self.host = host = channel.receive() diff --git a/py/test/dsession/testing/test_dsession.py b/py/test/dsession/testing/test_dsession.py index 73900b1a9..7ae2944a8 100644 --- a/py/test/dsession/testing/test_dsession.py +++ b/py/test/dsession/testing/test_dsession.py @@ -26,7 +26,7 @@ def dumpqueue(queue): class TestDSession: def test_fixoptions(self, testdir): config = testdir.parseconfig("--exec=xxx") - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) config.initsession().fixoptions() assert config.option.numprocesses == 1 config = testdir.parseconfig("--exec=xxx", '-n3') diff --git a/py/test/looponfail/remote.py b/py/test/looponfail/remote.py index 19c0cb150..b72fc5b45 100644 --- a/py/test/looponfail/remote.py +++ b/py/test/looponfail/remote.py @@ -129,7 +129,7 @@ def slave_runsession(channel, config, fullwidth, hasmarkup): config.option.usepdb = False config.option.executable = None trails = channel.receive() - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) DEBUG("SLAVE: initsession()") session = config.initsession() # XXX configure the reporter object's terminal writer more directly diff --git a/py/test/plugin/pytest_default.py b/py/test/plugin/pytest_default.py index 714f99a26..025cc83b8 100644 --- a/py/test/plugin/pytest_default.py +++ b/py/test/plugin/pytest_default.py @@ -100,7 +100,7 @@ def test_implied_different_sessions(tmpdir): def x(*args): config = py.test.config._reparse([tmpdir] + list(args)) try: - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) except ValueError: return Exception return getattr(config._sessionclass, '__name__', None) diff --git a/py/test/plugin/pytest_pytester.py b/py/test/plugin/pytest_pytester.py index 2efe5c20a..4d9d5643a 100644 --- a/py/test/plugin/pytest_pytester.py +++ b/py/test/plugin/pytest_pytester.py @@ -134,28 +134,28 @@ class TmpTestdir: def inline_runsession(self, session): config = session.config - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) sorter = EventRecorder(config.bus) session.main() - config.pytestplugins.unconfigure(config) + config.pytestplugins.do_unconfigure(config) return sorter def inline_run(self, *args): config = self.parseconfig(*args) - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) session = config.initsession() sorter = EventRecorder(config.bus) session.main() - config.pytestplugins.unconfigure(config) + config.pytestplugins.do_unconfigure(config) return sorter def inline_run_with_plugins(self, *args): config = self.parseconfig(*args) - config.pytestplugins.configure(config) + config.pytestplugins.do_configure(config) session = config.initsession() sorter = EventRecorder(config.bus) session.main() - config.pytestplugins.unconfigure(config) + config.pytestplugins.do_unconfigure(config) return sorter def config_preparse(self): diff --git a/py/test/pytestplugin.py b/py/test/pytestplugin.py index 3ff3a9d20..a11575947 100644 --- a/py/test/pytestplugin.py +++ b/py/test/pytestplugin.py @@ -85,13 +85,13 @@ class PytestPlugins(object): self.pyplugins.call_plugin(plugin, "pytest_addoption", parser=self._config._parser) self.pyplugins.call_plugin(plugin, "pytest_configure", config=self._config) - def configure(self, config): + def do_configure(self, config): assert not hasattr(self, '_config') config.bus.register(self) self._config = config self.pyplugins.call_each("pytest_configure", config=self._config) - def unconfigure(self, config): + def do_unconfigure(self, config): config = self._config del self._config self.pyplugins.call_each("pytest_unconfigure", config=config) diff --git a/py/test/testing/test_pytestplugin.py b/py/test/testing/test_pytestplugin.py index f9e813a78..b955fc1d4 100644 --- a/py/test/testing/test_pytestplugin.py +++ b/py/test/testing/test_pytestplugin.py @@ -158,7 +158,7 @@ class TestPytestPluginInteractions: from py.__.test.config import Config config = Config() config.parse([]) - config.pytestplugins.configure(config=config) + config.pytestplugins.do_configure(config=config) assert not hasattr(config.option, 'test123') p = testdir.makepyfile(""" class ConftestPlugin: @@ -181,7 +181,7 @@ class TestPytestPluginInteractions: config.bus.register(A()) assert len(l) == 0 - config.pytestplugins.configure(config=config) + config.pytestplugins.do_configure(config=config) assert len(l) == 1 config.bus.register(A()) # this should lead to a configured() plugin assert len(l) == 2 @@ -191,7 +191,7 @@ class TestPytestPluginInteractions: assert len(events) == 2 assert events == [42,42] - config.pytestplugins.unconfigure(config=config) + config.pytestplugins.do_unconfigure(config=config) config.bus.register(A()) assert len(l) == 2