Fix removing empty suites from multisource suite

yanne · yanne · commit bae5e6d579ce · 2019-06-06T12:15:02.000+03:00
diff --git a/src/robot/model/filter.py b/src/robot/model/filter.py
@@ -22,8 +22,12 @@
 
 class EmptySuiteRemover(SuiteVisitor):
 
+    def __init__(self, preserve_direct_children=False):
+        self.preserve_direct_children = preserve_direct_children
+
     def end_suite(self, suite):
-        suite.suites = [s for s in suite.suites if s.test_count]
+        if suite.parent or not self.preserve_direct_children:
+            suite.suites = [s for s in suite.suites if s.test_count]
 
     def visit_test(self, test):
         pass
@@ -37,6 +41,7 @@ class Filter(EmptySuiteRemover):
 
     def __init__(self, include_suites=None, include_tests=None,
                  include_tags=None, exclude_tags=None):
+        EmptySuiteRemover.__init__(self)
         self.include_suites = include_suites
         self.include_tests = include_tests
         self.include_tags = include_tags
diff --git a/src/robot/model/testsuite.py b/src/robot/model/testsuite.py
@@ -159,9 +159,9 @@ def configure(self, **options):
         if options:
             self.visit(SuiteConfigurer(**options))
 
-    def remove_empty_suites(self):
+    def remove_empty_suites(self, preserve_direct_children=False):
         """Removes all child suites not containing any tests, recursively."""
-        self.visit(EmptySuiteRemover())
+        self.visit(EmptySuiteRemover(preserve_direct_children))
 
     def visit(self, visitor):
         """:mod:`Visitor interface <robot.model.visitor>` entry-point."""
diff --git a/src/robot/running/builder/builders.py b/src/robot/running/builder/builders.py
@@ -47,7 +47,7 @@ def build(self, *paths):
         parser.parse(structure)
         suite = parser.suite
         suite.rpa = parser.rpa
-        suite.remove_empty_suites()
+        suite.remove_empty_suites(preserve_direct_children=len(paths) > 1)
         return suite
 
 
