# HG changeset patch -- Bitbucket.org
# Project py-trunk
# URL http://bitbucket.org/hpk42/py-trunk/overview
# User holger krekel <hol...@merlinux.eu>
# Date 1274515977 -7200
# Node ID 665908f06c93ee034bf27b13336091a2e230563b
# Parent bda43cc4d88ed9108f0452fd4a6b775eaabe670e
fix for python3 - class.__dict__ is now a dict_proxy which doesn't have
setdefault() anymore.
--- a/py/_plugin/pytest_mark.py
+++ b/py/_plugin/pytest_mark.py
@@ -44,11 +44,13 @@ with classes to apply markers to all its
class TestClass:
def test_startup(self):
...
+ def test_startup_and_more(self):
+ ...
This is equivalent to directly applying the decorator to the
-``test_startup`` function.
+two test functions.
-To remain compatible with Python2.5 you can instead set a
+To remain compatible with Python2.5 you can also set a
``pytestmark`` attribute on a TestClass like this::
import py
@@ -56,7 +58,7 @@ To remain compatible with Python2.5 you
class TestClass:
pytestmark = py.test.mark.webtest
-or if you need to use multiple markers::
+or if you need to use multiple markers you can use a list::
import py
@@ -68,7 +70,7 @@ You can also set a module level marker::
import py
pytestmark = py.test.mark.webtest
-in which case then it will be applied to all functions and
+in which case it will be applied to all functions and
methods defined in the module.
Using "-k MARKNAME" to select tests
@@ -114,11 +116,14 @@ class MarkDecorator:
if len(args) == 1 and hasattr(func, '__call__') or \
hasattr(func, '__bases__'):
if hasattr(func, '__bases__'):
- l = func.__dict__.setdefault("pytestmark", [])
- if not isinstance(l, list):
- func.pytestmark = [l, self]
- else:
- l.append(self)
+ if hasattr(func, 'pytestmark'):
+ l = func.pytestmark
+ if not isinstance(l, list):
+ func.pytestmark = [l, self]
+ else:
+ l.append(self)
+ else:
+ func.pytestmark = [self]
else:
holder = getattr(func, self.markname, None)
if holder is None:
_______________________________________________
py-svn mailing list
py-svn@codespeak.net
http://codespeak.net/mailman/listinfo/py-svn
