summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre-Yves David <pierre-yves.david@logilab.fr>2011-01-06 11:52:40 +0100
committerPierre-Yves David <pierre-yves.david@logilab.fr>2011-01-06 11:52:40 +0100
commitc56467adf7a74ee0ed46b77159aec339447dad68 (patch)
treeefdcd6d7259874505df1314c1c4834d282aabc53
parent8d00f2f8345128ebd34e8da1030c9ef240b3b242 (diff)
downloadlogilab-common-c56467adf7a74ee0ed46b77159aec339447dad68.tar.gz
[pytest] fix tag filtering
pytest TestSuite._wrapped_run method use two custom parameters (runcondition and options) that must be propagated to recursive call.
-rw-r--r--pytest.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/pytest.py b/pytest.py
index 20f00f0..5a4e261 100644
--- a/pytest.py
+++ b/pytest.py
@@ -1125,7 +1125,10 @@ def _ts_wrapped_run(self, result, debug=False, runcondition=None, options=None):
continue
if hasattr(test, '_wrapped_run'):
- test._wrapped_run(result, debug)
+ try:
+ test._wrapped_run(result, debug, runcondition=runcondition, options=options)
+ except TypeError:
+ test._wrapped_run(result, debug)
elif not debug:
try:
test(result, runcondition, options)