From 836232e544d4e082cd5cf185ea737325ac521077 Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 22 Jan 2014 10:24:22 +0100 Subject: [PATCH] fix issue425: mention at end of "py.test -h" that --markers and --fixtures work according to specified test path (or current dir) --- CHANGELOG | 3 +++ _pytest/helpconfig.py | 2 ++ 2 files changed, 5 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index bcb250fca..e9164b61a 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -8,6 +8,9 @@ UNRELEASED - fixed docs and code to use "pytest" instead of "py.test" everywhere. 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 ----------------------------------- diff --git a/_pytest/helpconfig.py b/_pytest/helpconfig.py index aafc9458d..1fef7eb3f 100644 --- a/_pytest/helpconfig.py +++ b/_pytest/helpconfig.py @@ -84,6 +84,8 @@ def showhelp(config): #tw.sep("=") tw.line("to see available markers type: py.test --markers") 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 tw.line("conftest.py options:")