Fix WITH NAME with embedded args and library state

pekkaklarck · pekkaklarck · commit 018077d8e876 · 2019-05-11T22:42:45.000+03:00
Fixes robotframework#3181.
diff --git a/atest/robot/test_libraries/with_name.robot b/atest/robot/test_libraries/with_name.robot
@@ -44,6 +44,9 @@ Embedded Arguments
     Check Log Message    ${tc.kws[0].msgs[0]}    arg
     Check Log Message    ${tc.kws[1].msgs[0]}    --args--
 
+Embedded Arguments With Library Having State
+    Check Test Case    ${TEST NAME}
+
 Arguments Containing Variables And Import Same Library Twice
     ${tc} =    Check Test Case    ${TEST NAME}
     Check Keyword Data    ${tc.kws[0]}    Param1.Parameters Should Be    args=1, 2
diff --git a/atest/testdata/test_libraries/Embedded.py b/atest/testdata/test_libraries/Embedded.py
@@ -0,0 +1,14 @@
+from robot.api.deco import keyword
+
+
+class Embedded(object):
+
+    def __init__(self):
+        self.called = 0
+
+    @keyword('Called ${times} time(s)', types={'times': int})
+    def called_times(self, times):
+        self.called += 1
+        if self.called != times:
+            raise AssertionError('Called %s time(s), expected %s time(s).'
+                                 % (self.called, times))
diff --git a/atest/testdata/test_libraries/with_name_2.robot b/atest/testdata/test_libraries/with_name_2.robot
@@ -10,6 +10,8 @@ Library           pythonmodule.library    WITH NAME    mod 2
 Library           ExampleJavaLibrary    WITH NAME    Java Lib
 Library           javapkg.JavaPackageExample    WITH NAME    Java Pkg
 Library           MyLibFile.py    WITH NAME    Params
+Library           Embedded.py    WITH NAME    Embedded1
+Library           Embedded.py    WITH NAME    Embedded2
 Library           RunKeywordLibrary    WITH NAME    dynamic
 Library           RunKeywordLibraryJava    WITH NAME    dynamicJava
 Library           libraryscope.Global    WITH NAME    G Scope
@@ -30,6 +32,13 @@ Embedded Arguments
     Keyword with embedded arg in MyLibFile
     Params.Keyword With Embedded --args-- in MyLibFile
 
+Embedded Arguments With Library Having State
+    Embedded1.Called 1 time(s)
+    Embedded1.Called 2 time(s)
+    Embedded2.Called 1 time(s)
+    Embedded1.Called 3 time(s)
+    Embedded2.Called 2 time(s)
+
 Arguments Containing Variables And Import Same Library Twice
     Param1.Parameters should be    1    2
     par am 2 . par A meter S should BE    VAR    ${42}
diff --git a/src/robot/running/handlers.py b/src/robot/running/handlers.py
@@ -13,6 +13,8 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
+from copy import copy
+
 from robot.utils import (getdoc, getshortdoc, is_java_init, is_java_method,
                          is_list_like, printable_name, split_tags_from_doc,
                          type_name)
@@ -262,18 +264,26 @@ class EmbeddedArgumentsHandler(object):
 
     def __init__(self, name_regexp, orig_handler):
         self.arguments = ArgumentSpec()  # Show empty argument spec for Libdoc
-        self._orig_handler = orig_handler
         self.name_regexp = name_regexp
+        self._orig_handler = orig_handler
 
     def __getattr__(self, item):
         return getattr(self._orig_handler, item)
 
+    @property
+    def library(self):
+        return self._orig_handler.library
+
+    @library.setter
+    def library(self, library):
+        self._orig_handler.library = library
+
     def matches(self, name):
         return self.name_regexp.match(name) is not None
 
     def create_runner(self, name):
         return EmbeddedArgumentsRunner(self, name)
 
     def __copy__(self):
-        # Needed due to https://github.com/IronLanguages/main/issues/1192
-        return EmbeddedArgumentsHandler(self.name_regexp, self._orig_handler)
+        orig_handler = copy(self._orig_handler)
+        return EmbeddedArgumentsHandler(self.name_regexp, orig_handler)
