shift pytest_configure/unconfigure/addoption/namespace hook calling to config object.

The _pytest.config module itself is no longer a plugin but the actual
config instance is plugin-registered as ``pytestconfig``.
This allows to put most pytest specific logic to _pytest.config instead
of in the core pluginmanager.
This commit is contained in:
holger krekel
2013-09-30 13:14:14 +02:00
parent 694c6fd0e7
commit d946299b0a
8 changed files with 81 additions and 83 deletions
+2 -2
View File
@@ -76,7 +76,7 @@ def wrap_session(config, doit):
initstate = 0
try:
try:
config.pluginmanager.do_configure(config)
config.do_configure()
initstate = 1
config.hook.pytest_sessionstart(session=session)
initstate = 2
@@ -105,7 +105,7 @@ def wrap_session(config, doit):
session=session,
exitstatus=session.exitstatus)
if initstate >= 1:
config.pluginmanager.do_unconfigure(config)
config.do_unconfigure()
config.pluginmanager.ensure_shutdown()
return session.exitstatus