recursing if dryrun

mkorpela · mkorpela · commit 87d109e7ee80 · 2020-10-20T16:22:31.000+03:00
diff --git a/atest/robot/cli/dryrun/if.robot b/atest/robot/cli/dryrun/if.robot
@@ -4,13 +4,13 @@ Test Teardown     Last keyword should have been validated
 Resource          dryrun_resource.robot
 
 *** Test Cases ***
-IF is not executed in dry run
+IF will not recurse in dry run
     Check Test Case    ${TESTNAME}
 
-ELSE IF is not executed in dry run
+ELSE IF will not recurse in dry run
     Check Test Case    ${TESTNAME}
 
-ELSE is not executed in dry run
+ELSE will not recurse in dry run
     Check Test Case    ${TESTNAME}
 
 Dryrun fail inside of IF
diff --git a/atest/testdata/cli/dryrun/if.robot b/atest/testdata/cli/dryrun/if.robot
@@ -2,15 +2,15 @@
 Resource        resource.robot
 
 *** Test Cases ***
-IF is not executed in dry run
+IF will not recurse in dry run
     Recursive if  call again
     This is validated
 
-ELSE IF is not executed in dry run
+ELSE IF will not recurse in dry run
     Recursive else if  call again
     This is validated
 
-ELSE is not executed in dry run
+ELSE will not recurse in dry run
     Recursive else  call again
     This is validated
 
diff --git a/src/robot/running/steprunner.py b/src/robot/running/steprunner.py
@@ -103,22 +103,27 @@ def _branch_to_be_executed(self, data, first, datacondition, body, condition_mat
         data_type = self._get_type(data, first, datacondition)
         condition_result = data_type == data.ELSE_TYPE
         unresolved_condition = ''
-        if self._context.dry_run:
-            condition_matched_already = True
         if not condition_result:
             unresolved_condition = datacondition[0]
-            if not condition_matched_already:
+            if not condition_matched_already and not self._context.dry_run:
                 condition, _ = VariableReplacer().replace([unresolved_condition], (), variables=self._context.variables)
                 resolved_condition = condition[0]
                 if is_unicode(resolved_condition):
                     condition_result = evaluate_expression(resolved_condition, self._context.variables)
                 else:
                     condition_result = bool(resolved_condition)
-        branch_to_execute = not condition_matched_already and condition_result and body
+        branch_to_execute = self._is_branch_to_execute(condition_matched_already,
+                                                       condition_result,
+                                                       body)
         result = KeywordResult(kwname=self._get_name(unresolved_condition),
                                type=data_type)
         return branch_to_execute, result
 
+    def _is_branch_to_execute(self, condition_matched_already, condition_result, body):
+        if self._context.dry_run:
+            return True
+        return not condition_matched_already and condition_result and body
+
     def _get_name(self, condition):
         if not condition:
             return ''
