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

move Item.applymarker to Node, and defer to it from Funcargrequest.applymarker

This commit is contained in:
Ronny Pfannschmidt 2012-09-30 22:17:33 +02:00
parent b9767fd74c
commit bee7543716
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
_pytest/main.py
View File

@ -196,6 +196,18 @@ class Node(object):
""" dictionary of Keywords / markers on this node. """ """ dictionary of Keywords / markers on this node. """
return vars(self.markers) return vars(self.markers)
def applymarker(self, marker):
""" Apply a marker to this item. This method is
useful if you have several parametrized function
and want to mark a single one of them.
:arg marker: a :py:class:`_pytest.mark.MarkDecorator` object
created by a call to ``py.test.mark.NAME(...)``.
"""
if not isinstance(marker, pytest.mark.XYZ.__class__):
raise ValueError("%r is not a py.test.mark.* object")
setattr(self.markers, marker.markname, marker)
#def extrainit(self): #def extrainit(self):
# """"extra initialization after Node is initialized. Implemented # """"extra initialization after Node is initialized. Implemented
# by some subclasses. """ # by some subclasses. """
@ -390,19 +402,6 @@ class Item(Node):
def reportinfo(self): def reportinfo(self):
return self.fspath, None, "" return self.fspath, None, ""
def applymarker(self, marker):
""" Apply a marker to this item. This method is
useful if you have several parametrized function
and want to mark a single one of them.
:arg marker: a :py:class:`_pytest.mark.MarkDecorator` object
created by a call to ``py.test.mark.NAME(...)``.
"""
if not isinstance(marker, pytest.mark.XYZ.__class__):
raise ValueError("%r is not a py.test.mark.* object")
self.keywords[marker.markname] = marker
@property @property
def location(self): def location(self):
try: try:

4
_pytest/python.py
View File

@ -1068,9 +1068,7 @@ class FuncargRequest:
:arg marker: a :py:class:`_pytest.mark.MarkDecorator` object :arg marker: a :py:class:`_pytest.mark.MarkDecorator` object
created by a call to ``py.test.mark.NAME(...)``. created by a call to ``py.test.mark.NAME(...)``.
""" """
if not isinstance(marker, py.test.mark.XYZ.__class__): self.node.applymarker(marker)
raise ValueError("%r is not a py.test.mark.* object")
setattr(self.node.markers, marker.markname, marker)
def raiseerror(self, msg): def raiseerror(self, msg):
""" raise a FuncargLookupError with the given message. """ """ raise a FuncargLookupError with the given message. """