From b0ec442d2498cbb48159f2c2469126c06d1a0d35 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Tue, 12 Jun 2018 17:50:08 +0200 Subject: [PATCH] rework Node.add_marker parameter list and docstring --- src/_pytest/mark/structures.py | 6 +++++- src/_pytest/nodes.py | 8 +++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/_pytest/mark/structures.py b/src/_pytest/mark/structures.py index 2b8dbf855..1a2bd73de 100644 --- a/src/_pytest/mark/structures.py +++ b/src/_pytest/mark/structures.py @@ -287,7 +287,11 @@ class MarkInfo(object): def validate_marks(self, attribute, value): for item in value: if not isinstance(item, Mark): - raise ValueError(item) + raise ValueError( + "MarkInfo expects Mark instances, got {!r} ({!r})".format( + item, type(item) + ) + ) combined = attr.ib( repr=False, diff --git a/src/_pytest/nodes.py b/src/_pytest/nodes.py index 264077f5d..ef74c53eb 100644 --- a/src/_pytest/nodes.py +++ b/src/_pytest/nodes.py @@ -173,12 +173,10 @@ class Node(object): chain.reverse() return chain - def add_marker(self, marker, append=True): - """ dynamically add a marker object to the node. + def add_marker(self, marker): + """dynamically add a marker object to the node. - ``marker`` can be a string or pytest.mark.* instance. - ``append=True`` whether to append the marker, - if false insert at position 0 + :type marker: str or pytest.mark.* """ from _pytest.mark import MarkDecorator, MARK_GEN