Improve empty suite handling

yanne · yanne · commit 2282b627091b · 2019-09-03T07:29:37.000+03:00
diff --git a/src/robot/run.py b/src/robot/run.py
@@ -424,7 +424,8 @@ def main(self, datasources, **options):
         LOGGER.info('Settings:\n%s' % unic(settings))
         builder = TestSuiteBuilder(settings['SuiteNames'],
                                    extension=settings.extension,
-                                   rpa=settings.rpa)
+                                   rpa=settings.rpa,
+                                   allow_empty_suite=settings.run_empty_suite)
         suite = builder.build(*datasources)
         settings.rpa = suite.rpa
         suite.configure(**settings.suite_config)
diff --git a/src/robot/running/builder/builders.py b/src/robot/running/builder/builders.py
@@ -28,10 +28,12 @@
 
 class TestSuiteBuilder(object):
 
-    def __init__(self, include_suites=None, extension=None, rpa=None):
+    def __init__(self, include_suites=None, extension=None, rpa=None,
+                 allow_empty_suite=False):
         self.rpa = rpa
         self.include_suites = include_suites
         self.extension = extension
+        self.allow_empty_suite = allow_empty_suite
 
     def build(self, *paths):
         """
@@ -42,7 +44,10 @@ def build(self, *paths):
                                           self.extension).build(paths)
         parser = SuiteStructureParser(self.rpa)
         suite = parser.parse(structure)
-        self._validate_test_counts(suite, multisource=len(paths) > 1)
+        if not self.include_suites and not self.allow_empty_suite:
+            self._validate_test_counts(suite, multisource=len(paths) > 1)
+        # TODO: do we need `preserve_direct_children`?
+        suite.remove_empty_suites(preserve_direct_children=len(paths) > 1)
         return suite
 
     def _validate_test_counts(self, suite, multisource=False):
@@ -55,8 +60,6 @@ def validate(suite):
         else:
             for s in suite.suites:
                 validate(s)
-        # TODO: do we need `preserve_direct_children`?
-        suite.remove_empty_suites(preserve_direct_children=multisource)
 
 
 class ResourceFileBuilder(object):
