drafting

mkorpela · mkorpela · commit 201ff569a94e · 2020-09-16T14:14:16.000+03:00
diff --git a/atest/testdata/misc/pass_and_fail.robot b/atest/testdata/misc/pass_and_fail.robot
@@ -13,6 +13,7 @@ Pass
     [Tags]    pass
     # I am a comment. Please ignore me.
     My Keyword    Pass
+    Log  hello
 
 Fail
     [Documentation]    FAIL Expected failure
diff --git a/klisgenes.py b/klisgenes.py
@@ -0,0 +1,10 @@
+ROBOT_LISTENER_API_VERSION=3
+
+def start_suite(data, result):
+    print(repr(data))
+
+def start_keyword(data, result):
+    data.name = "Log many"
+
+def end_keyword(data, result):
+    print(f"YEAH 2 {data.name}")
diff --git a/src/robot/output/listeners.py b/src/robot/output/listeners.py
@@ -124,7 +124,6 @@ def __init__(self, listener, method_names, prefix=None):
         self.name = name
         self.version = self._get_version(listener)
         if self.version == 3:
-            self.start_keyword = self.end_keyword = None
             self.library_import = self.resource_import = self.variables_import = None
 
     def _import_listener(self, listener):
diff --git a/src/robot/running/librarykeywordrunner.py b/src/robot/running/librarykeywordrunner.py
@@ -51,7 +51,8 @@ def longname(self):
 
     def run(self, kw, context):
         assignment = VariableAssignment(kw.assign)
-        with StatusReporter(context, self._get_result(kw, assignment)):
+        from robot.running.runner import ModelCombiner
+        with StatusReporter(context, ModelCombiner(data=kw, result=self._get_result(kw, assignment))):
             with assignment.assigner(context) as assigner:
                 return_value = self._run(context, kw.args)
                 assigner.assign(return_value)
diff --git a/src/robot/running/usererrorhandler.py b/src/robot/running/usererrorhandler.py
@@ -64,7 +64,8 @@ def run(self, kw, context):
                                args=kw.args,
                                assign=kw.assign,
                                type=kw.type)
-        with StatusReporter(context, result):
+        from .runner import ModelCombiner
+        with StatusReporter(context, ModelCombiner(kw, result)):
             raise self.error
 
     dry_run = run
diff --git a/src/robot/running/userkeywordrunner.py b/src/robot/running/userkeywordrunner.py
@@ -49,9 +49,11 @@ def arguments(self):
         return self._handler.arguments
 
     def run(self, kw, context):
+        from .runner import ModelCombiner
         assignment = VariableAssignment(kw.assign)
         result = self._get_result(kw, assignment, context.variables)
-        with StatusReporter(context, result):
+        mc = ModelCombiner(data=kw, result=result)
+        with StatusReporter(context, mc):
             with assignment.assigner(context) as assigner:
                 return_value = self._run(context, kw.args, result)
                 assigner.assign(return_value)
