Fix remove keywords for PASSED case. Add more tests

Author: HardNorth

robotframework_reportportal/listener.py

@@ -234,13 +234,24 @@ def _post_skipped_keywords(self, to_post: Optional[Any]) -> None:
         if isinstance(to_post, Keyword):
             if not to_post.posted:
                 self._do_start_keyword(to_post)
-                for log_message in to_post.skipped_logs:
+                log_messages = to_post.skipped_logs
+                to_post.skipped_logs = []
+                for log_message in log_messages:
                     self.__post_log_message(log_message)
-        skipped_kwds = getattr(to_post, "skipped_keywords", None)
+        skipped_kwds = to_post.skipped_keywords
         if skipped_kwds:
             to_post.skipped_keywords = []
             for skipped_kwd in skipped_kwds:
                 if skipped_kwd.posted:
+                    log_messages = skipped_kwd.skipped_logs
+                    skipped_kwd.skipped_logs = []
+                    for log_message in log_messages:
+                        self.__post_log_message(log_message)
+                    skipped_child_kwds = skipped_kwd.skipped_keywords
+                    for skipped_child_kwd in skipped_child_kwds:
+                        if skipped_child_kwd.posted:
+                            continue
+                        self.__post_skipped_keyword(skipped_child_kwd)
                     continue
                 self.__post_skipped_keyword(skipped_kwd)
 
@@ -457,8 +468,11 @@ def end_test(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = None)
         test = self.current_item.update(attributes)
         if not test.critical and test.status == "FAIL":
             test.status = "SKIP"
-        if test.remove_data and attributes["status"] == "FAIL":
+        if attributes["status"] == "FAIL" and self._remove_passed_keywords:
             self._post_skipped_keywords(test)
+        elif self._remove_passed_keywords:
+            for kwd in test.skipped_keywords:
+                self._log_keyword_content_removed(kwd.rp_item_id, kwd.start_time)
         logger.debug(f"ReportPortal - End Test: {test.robot_attributes}")
         self._remove_current_item()
         self.service.finish_test(test=test, ts=ts)
@@ -504,7 +518,9 @@ def start_keyword(self, name: str, attributes: Dict, ts: Optional[Any] = None) -
         else:
             self._do_start_keyword(kwd, ts)
             if skip_data:
-                self._log_keyword_content_removed(kwd.rp_item_id, kwd.start_time)
+                kwd.skip_origin = kwd
+            if self._remove_passed_keywords:
+                parent.skipped_keywords.append(kwd)
 
         self._add_current_item(kwd)
 
@@ -553,7 +569,10 @@ def end_keyword(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = No
             self._post_skipped_keywords(last_iteration)
             self._do_end_keyword(last_iteration, ts)
         elif kwd.posted and kwd.remove_data and kwd.skip_origin is kwd:
-            self._log_keyword_data_removed(kwd.rp_item_id, kwd.start_time)
+            if self._remove_all_keyword_content:
+                self._log_keyword_content_removed(kwd.rp_item_id, kwd.start_time)
+            elif not self._remove_passed_keywords:
+                self._log_keyword_data_removed(kwd.rp_item_id, kwd.start_time)
 
         self._remove_current_item()
         if not kwd.posted:

robotframework_reportportal/model.py

@@ -243,6 +243,7 @@ class Test:
     status: str
     template: str
     type: str = "TEST"
+    skipped_keywords: List[Keyword]
     remove_data: bool = False
 
     def __init__(self, name: str, robot_attributes: Dict[str, Any], test_attributes: List[str]):
@@ -269,6 +270,7 @@ def __init__(self, name: str, robot_attributes: Dict[str, Any], test_attributes:
         self.status = robot_attributes.get("status")
         self.template = robot_attributes["template"]
         self.type = "TEST"
+        self.skipped_keywords = []
 
     @property
     def critical(self) -> bool:

tests/integration/test_remove_keywords.py

@@ -176,6 +176,39 @@
             1,
             "Content removed using the --remove-keywords option.",
         ),
+        (
+            "examples/for_keyword_failed.robot",
+            "PASSED",
+            1,
+            ["FAILED"] + ["PASSED"] + ["SKIPPED"] * 2 + ["PASSED"] * 2 + ["FAILED"] * 5,
+            3,
+            0,
+            "apple",
+        ),
+        (
+            "examples/while_keyword_failed.robot",
+            "PASSED",
+            1,
+            ["PASSED"] + ["FAILED"] + ["PASSED"] * 2 + ["SKIPPED"] * 2 + ["PASSED"] * 3 + ["FAILED"] * 5,
+            7,
+            0,
+            "Length is 3.",
+        ),
+        (
+            "examples/wuks_keyword_failed.robot",
+            "PASSED",
+            1,
+            ["FAILED"]
+            + ["PASSED"] * 2
+            + ["FAILED"] * 3
+            + ["PASSED"] * 2
+            + ["FAILED"] * 3
+            + ["PASSED"] * 2
+            + ["FAILED"] * 5,
+            10,
+            0,
+            "Keyword 'Fail on first try' failed after retrying 3 times. The last error was: To less executions",
+        ),
     ],
 )
 @mock.patch(REPORT_PORTAL_SERVICE)