From d2ea7387f20705746977161bbaa7d9e3c9d4ddb5 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Sun, 26 Apr 2015 00:47:24 +0200 Subject: [PATCH] re-add tryfirst/trylast marker documentation, mark it as to be removed --HG-- branch : more_plugin --- _pytest/config.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/_pytest/config.py b/_pytest/config.py index 581e14e94..72f4d0a22 100644 --- a/_pytest/config.py +++ b/_pytest/config.py @@ -129,6 +129,14 @@ class PytestPluginManager(PluginManager): return self.get_plugin(name) def pytest_configure(self, config): + # XXX now that the pluginmanager exposes hookimpl_opts(tryfirst...) + # we should remove tryfirst/trylast as markers + config.addinivalue_line("markers", + "tryfirst: mark a hook implementation function such that the " + "plugin machinery will try to call it first/as early as possible.") + config.addinivalue_line("markers", + "trylast: mark a hook implementation function such that the " + "plugin machinery will try to call it last/as late as possible.") for warning in self._warnings: config.warn(code="I1", message=warning)