Fine tune fix for handling broken assign (#4118)

pekkaklarck · pekkaklarck · commit 2c2f21a587d0 · 2021-10-13T23:35:42.000+03:00
- Add acceptance tests.
- Avoid overly long line.
diff --git a/atest/robot/variables/return_values.robot b/atest/robot/variables/return_values.robot
@@ -212,3 +212,12 @@ Invalid count error is catchable
 
 Invalid type error is catchable
     Check Test Case    ${TESTNAME}
+
+Invalid assign
+    Check Test Case    ${TESTNAME}
+
+Invalid assign with assign mark
+    Check Test Case    ${TESTNAME}
+
+Too many assign marks
+    Check Test Case    ${TESTNAME}
diff --git a/atest/testdata/variables/return_values.robot b/atest/testdata/variables/return_values.robot
@@ -334,6 +334,18 @@ Invalid type error is catchable
     ...    Assign dict variable    not dict               AND
     ...    Fail    Also this is executed!
 
+Invalid assign
+    [Documentation]    FAIL No keyword with name '\${oops' found.
+    ${oops    Set Variable    whatever
+
+Invalid assign with assign mark
+    [Documentation]    FAIL No keyword with name '\${oops=' found.
+    ${oops=    Set Variable    whatever
+
+Too many assign marks
+    [Documentation]    FAIL No keyword with name '\${oops}==' found.
+    ${oops}==    Set Variable    whatever
+
 *** Keywords ***
 Assign multiple variables
      [Arguments]    @{args}
diff --git a/src/robot/variables/search.py b/src/robot/variables/search.py
@@ -124,7 +124,8 @@ def is_dict_variable(self):
 
     def is_assign(self, allow_assign_mark=False):
         if allow_assign_mark and self.string.endswith('='):
-            return search_variable(rstrip(self.string[:-1]), ignore_errors=True).is_assign()
+            match = search_variable(rstrip(self.string[:-1]), ignore_errors=True)
+            return match.is_assign()
         return (self.is_variable()
                 and self.identifier in '$@&'
                 and not self.items
