Fix keyword teardown w/ non-existing variable in dry-run

pekkaklarck · pekkaklarck · commit 4b85e50a8fb0 · 2019-08-22T01:37:28.000+03:00
Fixes robotframework#3229
diff --git a/atest/robot/cli/dryrun/dryrun.robot b/atest/robot/cli/dryrun/dryrun.robot
@@ -60,11 +60,9 @@ Setup/teardown with non-existing variable is ignored
 
 Setup/teardown with existing variable is resolved and executed
     ${tc} =    Check Test Case    ${TESTNAME}
-    Should Be Equal    ${tc.setup.name}    BuiltIn.No Operation
-    Should Be Equal    ${tc.teardown.name}    Teardown
-    ${args} =    Create List    \${nonex arg}
-    Lists Should Be Equal    ${tc.teardown.args}    ${args}
-    Should Be Equal    ${tc.teardown.keywords[0].name}    BuiltIn.Log
+    Check Keyword Data    ${tc.setup}    BuiltIn.No Operation    status=NOT_RUN
+    Check Keyword Data    ${tc.teardown}    Teardown    args=\${nonex arg}
+    Check Keyword Data    ${tc.teardown.keywords[0]}    BuiltIn.Log    args=\${arg}    status=NOT_RUN
 
 User keyword return value
     Check Test Case    ${TESTNAME}
@@ -80,6 +78,14 @@ Keyword Teardown
     Should have correct number of keywords    ${tc}    2
     Should Be Equal    ${tc.kws[0].kws[1].name}    Does not exist
 
+Keyword teardown with non-existing variable is ignored
+    Check Test Case    ${TESTNAME}
+
+Keyword teardown with existing variable is resolved and executed
+    ${tc}=    Check Test Case    ${TESTNAME}
+    Check Keyword Data    ${tc.kws[0].kws[-1]}    Teardown    args=\${I DO NOT EXIST}
+    Check Keyword Data    ${tc.kws[0].kws[-1].kws[0]}    BuiltIn.Log    args=\${arg}    status=NOT_RUN
+
 For Loops
     ${tc}=    Check Test Case    ${TESTNAME}
     Should have correct number of keywords    ${tc}    4
diff --git a/atest/testdata/cli/dryrun/dryrun.robot b/atest/testdata/cli/dryrun/dryrun.robot
@@ -13,7 +13,6 @@ Suite Setup       ${SUITE SETUP}
 # Library keywords get NOT_RUN status. That should be OK teardown status.
 Suite Teardown    No Operation
 
-
 *** Variables ***
 ${SETUP}          No Operation
 ${TEARDOWN}       Teardown
@@ -89,6 +88,14 @@ Keyword Teardown
     Keyword with Teardown
     This is validated
 
+Keyword teardown with non-existing variable is ignored
+    Keyword with teardown with non-existing variable
+    This is validated
+
+Keyword teardown with existing variable is resolved and executed
+    Keyword with teardown with existing variable
+    This is validated
+
 For Loops
     [Documentation]    FAIL    Keyword 'resource.Anarchy in the UK' expected 3 arguments, got 2.
     FOR    ${i}    IN RANGE    10
@@ -137,6 +144,14 @@ Keyword with Teardown
     No Operation
     [Teardown]    Does not exist
 
+Keyword with teardown with non-existing variable
+    No Operation
+    [Teardown]    ${I DO NOT EXIST}
+
+Keyword with teardown with existing variable
+    No Operation
+    [Teardown]    ${TEARDOWN}    ${I DO NOT EXIST}
+
 Invalid Syntax UK
     [Arguments]    ${arg
     No Operation
diff --git a/src/robot/running/userkeywordrunner.py b/src/robot/running/userkeywordrunner.py
@@ -192,6 +192,8 @@ def _run_teardown(self, context):
         try:
             name = context.variables.replace_string(self._handler.teardown.name)
         except DataError as err:
+            if context.dry_run:
+                return None
             return ExecutionFailed(err.message, syntax=True)
         if name.upper() in ('', 'NONE'):
             return None
