fix keywords that get called from a .py file in a .robot test only appearing in the robot log on the first call

Author: DetachHead

pytest_robotframework/_internal/robot/listeners_and_suite_visitors.py

@@ -656,22 +656,27 @@ class KeywordUnwrapper(ListenerV3):
         printed a second time since they would already have been printed in a child keyword
         """
 
+        def __init__(self) -> None:
+            self.__original_keyword_stack = list[Function | None]()
+
         @override
         def start_library_keyword(
             self,
             data: running.Keyword,
             implementation: running.LibraryKeyword,
             result: result.Keyword,  # pylint:disable=redefined-outer-name
         ):
+            """replaces a decorated keyword for when it gets called from a `.robot` file"""
             if not isinstance(implementation, StaticKeyword):
                 return
-            original_function: Function | None = getattr(
+            original_function = getattr(
                 implementation.method, _keyword_original_function_attr, None
             )
-
+            self.__original_keyword_stack.append(
+                getattr(implementation.owner.instance, implementation.method_name, None)  # pyright:ignore[reportAny]
+            )
             if original_function is None:
                 return
-
             setattr(
                 implementation.owner.instance,  # pyright:ignore[reportAny]
                 implementation.method_name,
@@ -681,3 +686,25 @@ def start_library_keyword(
                     else original_function
                 ),
             )
+
+        @override
+        def end_library_keyword(
+            self,
+            data: running.Keyword,
+            implementation: running.LibraryKeyword,
+            result: result.Keyword,  # pylint:disable=redefined-outer-name
+        ):
+            """
+            after the keyword is finished, restore its original value. otherwise if it gets called
+            again from a `.py` file, it won't show up as a keyword in the robot log.
+            """
+            if not isinstance(implementation, StaticKeyword):
+                return
+            original_keyword = self.__original_keyword_stack.pop()
+            if original_keyword is None:
+                return
+            setattr(
+                implementation.owner.instance,  # pyright:ignore[reportAny]
+                implementation.method_name,
+                original_keyword,
+            )

tests/fixtures/test_robot/test_keyword_called_twice_in_robot_test/__init__.py

@@ -0,0 +1,7 @@
+*** Settings ***
+Library     ./foo.py
+
+
+*** Test Cases ***
+Asdfasdf
+    Bar

tests/fixtures/test_robot/test_keyword_called_twice_in_robot_test/a.robot

@@ -0,0 +1,13 @@
+from __future__ import annotations
+
+from pytest_robotframework import keyword
+
+
+@keyword
+def foo(): ...
+
+
+@keyword
+def bar():
+    foo()
+    foo()

tests/fixtures/test_robot/test_keyword_called_twice_in_robot_test/foo.py

@@ -342,3 +342,11 @@ def test_keyword_decorator_class_library(pr: PytestRobotTester):
 def test_pass_execution(pr: PytestRobotTester):
     pr.run_and_assert_result(passed=1)
     pr.assert_log_file_exists()
+
+
+def test_keyword_called_twice_in_robot_test(pr: PytestRobotTester):
+    pr.run_and_assert_result(passed=1)
+    pr.assert_log_file_exists()
+    results = output_xml().xpath("//kw[@name='Run Test']/kw[@name='Bar']/kw[@name='Foo']")
+    assert isinstance(results, list)
+    assert len(results) == 2