diff options
| author | holger krekel <holger@merlinux.eu> | 2013-09-30 13:14:14 +0200 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2013-09-30 13:14:14 +0200 |
| commit | d946299b0a3e42e447c92b6074f196077b9b7a91 (patch) | |
| tree | 087a4fd36d5f83654316eaff8b1820612884014b /testing/test_session.py | |
| parent | 694c6fd0e7f4270b43fb14d3a31d8b4d828bb11f (diff) | |
| download | pytest-d946299b0a3e42e447c92b6074f196077b9b7a91.tar.gz | |
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.
Diffstat (limited to 'testing/test_session.py')
| -rw-r--r-- | testing/test_session.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/testing/test_session.py b/testing/test_session.py index e8e67bde2..f206760cc 100644 --- a/testing/test_session.py +++ b/testing/test_session.py @@ -208,13 +208,14 @@ def test_plugin_specify(testdir): testdir.parseconfig("-p", "nqweotexistent") """) #pytest.raises(ImportError, - # "config.pluginmanager.do_configure(config)" + # "config.do_configure(config)" #) def test_plugin_already_exists(testdir): config = testdir.parseconfig("-p", "terminal") assert config.option.plugins == ['terminal'] - config.pluginmanager.do_configure(config) + config.do_configure() + config.do_unconfigure() def test_exclude(testdir): hellodir = testdir.mkdir("hello") |