Merge pull request #7402 from bluetech/fix-nodes-keywords-typo
nodes: fix string possibly stored in Node.keywords instead of MarkDecorator
This commit is contained in:
		
						commit
						c6f4c2e5c6
					
				| 
						 | 
					@ -276,7 +276,7 @@ class Node(metaclass=NodeMeta):
 | 
				
			||||||
            marker_ = getattr(MARK_GEN, marker)
 | 
					            marker_ = getattr(MARK_GEN, marker)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
            raise ValueError("is not a string or pytest.mark.* Marker")
 | 
					            raise ValueError("is not a string or pytest.mark.* Marker")
 | 
				
			||||||
        self.keywords[marker_.name] = marker
 | 
					        self.keywords[marker_.name] = marker_
 | 
				
			||||||
        if append:
 | 
					        if append:
 | 
				
			||||||
            self.own_markers.append(marker_.mark)
 | 
					            self.own_markers.append(marker_.mark)
 | 
				
			||||||
        else:
 | 
					        else:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue