p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

doc: fix argument order for pytest_load_initial_conftests

This commit is contained in:
Daniel Hahler 2016-03-12 17:31:32 +01:00
parent b46c7dddaa
commit bdddc9c38b
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -23,6 +23,7 @@ Christian Theunert
Christian Tismer Christian Tismer
Christopher Gilling Christopher Gilling
Daniel Grana Daniel Grana
Daniel Hahler
Daniel Nuri Daniel Nuri
Dave Hunt Dave Hunt
David Mohr David Mohr

2
_pytest/hookspec.py
View File

@ -81,7 +81,7 @@ def pytest_cmdline_main(config):
""" called for performing the main command line action. The default """ called for performing the main command line action. The default
implementation will invoke the configure hooks and runtest_mainloop. """ implementation will invoke the configure hooks and runtest_mainloop. """
def pytest_load_initial_conftests(args, early_config, parser): def pytest_load_initial_conftests(early_config, parser, args):
""" implements the loading of initial conftest files ahead """ implements the loading of initial conftest files ahead
of command line option parsing. """ of command line option parsing. """