floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix issue425: mention at end of "py.test -h" that --markers 

and --fixtures work according to specified test path (or current dir)
This commit is contained in:
holger krekel 2014-01-22 10:24:22 +01:00
parent 2539e5a352
commit 836232e544
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG
View File

@ -8,6 +8,9 @@ UNRELEASED
- fixed docs and code to use "pytest" instead of "py.test" everywhere. - fixed docs and code to use "pytest" instead of "py.test" everywhere.
Thanks Jurko Gospodnetic for the complete PR. Thanks Jurko Gospodnetic for the complete PR.
- fix issue425: mention at end of "py.test -h" that --markers
and --fixtures work according to specified test path (or current dir)
2.5.1 2.5.1
----------------------------------- -----------------------------------

2
_pytest/helpconfig.py
View File

@ -84,6 +84,8 @@ def showhelp(config):
#tw.sep("=") #tw.sep("=")
tw.line("to see available markers type: py.test --markers") tw.line("to see available markers type: py.test --markers")
tw.line("to see available fixtures type: py.test --fixtures") tw.line("to see available fixtures type: py.test --fixtures")
tw.line("(shown according to specified file_or_dir or current dir "
"if not specified)")
return return
tw.line("conftest.py options:") tw.line("conftest.py options:")