Fixed issue #306: Keywords and markers are now matched in a defined way. Also applied some pep8 formatting while fixing.

1 files changed, 12 insertions, 0 deletions

diff --git a/_pytest/main.py b/_pytest/main.py
index 95b2359bc..a039cf221 100644
--- a/_pytest/main.py
+++ b/_pytest/main.py
@@ -216,6 +216,9 @@ class Node(object):
         #: keywords/markers collected from all scopes
         self.keywords = NodeKeywords(self)
 
+        #: allow adding of extra keywords to use for matching
+        self.extra_keyword_matches = []
+
         #self.extrainit()
 
     @property
@@ -307,6 +310,15 @@ class Node(object):
         chain.reverse()
         return chain
 
+    def listextrakeywords(self):
+        """ Return a list of all extra keywords in self and any parents."""
+        extra_keywords = []
+        item = self
+        while item is not None:
+            extra_keywords.extend(item.extra_keyword_matches)
+            item = item.parent
+        return extra_keywords
+
     def listnames(self):
         return [x.name for x in self.listchain()]