Ignore empty --include/--exclude/--suite/--test.

pekkaklarck · pekkaklarck · commit 0ca44a321bae · 2022-09-18T14:21:53.000+03:00
Fixes #4441.
diff --git a/atest/robot/tags/include_and_exclude.robot b/atest/robot/tags/include_and_exclude.robot
@@ -3,7 +3,7 @@ Test Template     Run And Check Include And Exclude
 Resource          atest_resource.robot
 
 *** Variables ***
-# Note: The test case Robot-exclude in 
+# Note: The test case Robot-exclude in
 # atest\testdata\tags\include_and_exclude.robot
 # should always be automatically excluded since it
 # uses the robot:exclude tag
@@ -16,6 +16,9 @@ ${DATA SOURCES}   tags/include_and_exclude.robot
 No Includes Or Excludes
     ${EMPTY}    @{ALL}
 
+Empty iclude and exclude are ignored
+    --include= --exclude=    @{ALL}
+
 One Include
     --include incl1    @{INCL_ALL}
 
diff --git a/atest/robot/tags/include_and_exclude_with_rebot.robot b/atest/robot/tags/include_and_exclude_with_rebot.robot
@@ -19,6 +19,9 @@ ${INPUT FILES}    ${INPUT FILE}
 No Includes Or Excludes
     ${EMPTY}    @{ALL}
 
+Empty iclude and exclude are ignored
+    --include= --exclude=    @{ALL}    times_are_none=False
+
 One Include
     --include incl1    @{INCL_ALL}
 
@@ -148,14 +151,19 @@ Create Input Files
     Create Output With Robot    ${INPUT FILE}    ${EMPTY}    ${TEST FILE}
 
 Run And Check Include And Exclude
-    [Arguments]    ${params}    @{tests}
+    [Arguments]    ${params}    @{tests}    ${times_are_none}=${{bool($params)}}
     Run Rebot    ${params}    ${INPUT FILES}
     Stderr Should Be Empty
     Should Contain Tests    ${SUITE}    @{tests}
     Should Be True    $SUITE.statistics.passed == len($tests)
     Should Be True    $SUITE.statistics.failed == 0
-    Should Be Equal    ${SUITE.starttime}    ${{None if $params else $ORIG_START}}
-    Should Be Equal    ${SUITE.endtime}      ${{None if $params else $ORIG_END}}
+    IF    ${times_are_none}
+        Should Be Equal    ${SUITE.starttime}    ${None}
+        Should Be Equal    ${SUITE.endtime}      ${None}
+    ELSE
+        Should Be Equal    ${SUITE.starttime}    ${ORIG_START}
+        Should Be Equal    ${SUITE.endtime}      ${ORIG_END}
+    END
     Elapsed Time Should Be Valid    ${SUITE.elapsedtime}
     Should Be True    $SUITE.elapsedtime <= $ORIG_ELAPSED + 1
 
diff --git a/src/robot/conf/settings.py b/src/robot/conf/settings.py
@@ -391,19 +391,22 @@ def split_log(self):
 
     @property
     def suite_names(self):
-        return self['SuiteNames'] or None
+        return self._filter_empty(self['SuiteNames'])
+
+    def _filter_empty(self, items):
+        return [i for i in items if i] or None
 
     @property
     def test_names(self):
-        return (self['TestNames'] + self['TaskNames']) or None
+        return self._filter_empty(self['TestNames'] + self['TaskNames'])
 
     @property
     def include(self):
-        return self['Include'] or None
+        return self._filter_empty(self['Include'])
 
     @property
     def exclude(self):
-        return self['Exclude'] or None
+        return self._filter_empty(self['Exclude'])
 
     @property
     def pythonpath(self):
