Merge pull request #3637 from RonnyPfannschmidt/fix-3631

fix #3631 - don't store legacy markinfo when its impossible
2018-06-30 17:48:46 -03:00
parent 26e1784e52 5bd5b8c68a
commit 2b75a311a7
3 changed files with 15 additions and 1 deletions
--- a/src/_pytest/mark/structures.py
+++ b/src/_pytest/mark/structures.py
@@ -259,7 +259,7 @@ def store_legacy_markinfo(func, mark):
    if holder is None:
        holder = MarkInfo.for_mark(mark)
        setattr(func, mark.name, holder)
-    else:
+    elif isinstance(holder, MarkInfo):
        holder.add_mark(mark)