jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix issue490: include pytest_load_initial_conftests in documentation 

and improve docstring.
This commit is contained in:
holger krekel 2014-03-25 14:43:58 +01:00
parent 50abe43216
commit 8f7b53e55b
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -15,6 +15,9 @@ NEXT (2.6)
during collection/loading of test modules. Thanks to Marc Schlaich
for the complete PR.
- fix issue490: include pytest_load_initial_conftests in documentation
and improve docstring.
2.5.2
-----------------------------------

4
_pytest/hookspec.py
View File

@ -53,8 +53,8 @@ def pytest_cmdline_main(config):
pytest_cmdline_main.firstresult = True
def pytest_load_initial_conftests(args, early_config, parser):
""" implements loading initial conftests.
"""
""" implements the loading of initial conftest files ahead
of command line option parsing. """
def pytest_configure(config):
""" called after command line options have been parsed

1
doc/en/plugins.txt
View File

@ -309,6 +309,7 @@ Initialization, command line and configuration hooks
.. currentmodule:: _pytest.hookspec
.. autofunction:: pytest_load_initial_conftests
.. autofunction:: pytest_cmdline_preparse
.. autofunction:: pytest_cmdline_parse
.. autofunction:: pytest_namespace