From 8f7b53e55ba8d363d10f6376adf847cfb78ac9fb Mon Sep 17 00:00:00 2001 From: holger krekel Date: Tue, 25 Mar 2014 14:43:58 +0100 Subject: [PATCH] fix issue490: include pytest_load_initial_conftests in documentation and improve docstring. --- CHANGELOG | 3 +++ _pytest/hookspec.py | 4 ++-- doc/en/plugins.txt | 1 + 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 0c65f1ae4..0cbb05441 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 ----------------------------------- diff --git a/_pytest/hookspec.py b/_pytest/hookspec.py index c33b6d172..95d041c55 100644 --- a/_pytest/hookspec.py +++ b/_pytest/hookspec.py @@ -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 diff --git a/doc/en/plugins.txt b/doc/en/plugins.txt index 357df6e21..a6c57a430 100644 --- a/doc/en/plugins.txt +++ b/doc/en/plugins.txt @@ -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