Ignore metadata subtrees [fix #43]

Author: psss

examples/child/nobody/.fmf/version

@@ -0,0 +1 @@
+1

examples/child/nobody/main.fmf

@@ -0,0 +1,2 @@
+# Metadata subtrees are ignored
+ignored: yes

fmf/base.py

@@ -257,10 +257,14 @@ def grow(self, path):
             # Handle other *.fmf files as children
             else:
                 self.child(os.path.splitext(filename)[0], data, fullpath)
-        # Explore every child directory (ignore hidden)
+        # Explore every child directory (ignore hidden dirs and subtrees)
         for dirname in sorted(dirnames):
             if dirname.startswith("."):
                 continue
+            # Ignore metadata subtrees
+            if os.path.isdir(os.path.join(path, dirname, SUFFIX)):
+                log.debug("Ignoring metadata tree '{0}'.".format(dirname))
+                continue
             self.child(dirname, os.path.join(path, dirname))
         # Apply inheritance when all scattered data are gathered.
         # This is done only once, from the top parent object.

tests/test_base.py

@@ -68,6 +68,11 @@ def test_scattered_inheritance(self):
         assert(grandson.data['nose'] == 'long')
         assert(grandson.data['hair'] == 'fair')
 
+    def test_subtrees(self):
+        """ Subtrees should be ignored """
+        child = Tree(EXAMPLES + "child")
+        assert child.find("/nobody") is None
+
     def test_deep_hierarchy(self):
         """ Deep hierarchy on one line """
         deep = Tree(EXAMPLES + "deep")