Fix remove ALL reporting, add test

Author: HardNorth

robotframework_reportportal/listener.py

@@ -516,10 +516,8 @@ def end_keyword(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = No
         :param ts:         Timestamp(used by the ResultVisitor)
         """
         kwd = self.current_item.update(attributes)
-        if kwd.status == "FAIL" and not kwd.posted and kwd.matched_filter is not WKUS_KEYWORD_MATCH:
-            self._post_skipped_keywords(kwd)
 
-        if kwd.matched_filter is WKUS_KEYWORD_MATCH and WKUS_KEYWORD_MATCH.match(kwd):
+        if kwd.matched_filter is WKUS_KEYWORD_MATCH and kwd.skip_origin is kwd:
             skipped_kwds = kwd.skipped_keywords
             skipped_kwds_num = len(skipped_kwds)
             if skipped_kwds_num > 2:
@@ -537,19 +535,18 @@ 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.matched_filter is FOR_KEYWORD_MATCH and FOR_KEYWORD_MATCH.match(kwd)) or (
-            kwd.matched_filter is WHILE_KEYWORD_NAME and WHILE_KEYWORD_NAME.match(kwd)
-        ):
+        elif (
+            (kwd.matched_filter is FOR_KEYWORD_MATCH) or (kwd.matched_filter is WHILE_KEYWORD_NAME)
+        ) and kwd.skip_origin is kwd:
             skipped_kwds = kwd.skipped_keywords
             skipped_kwds_num = len(skipped_kwds)
             if skipped_kwds_num > 1:
                 self._log_data_removed(
                     kwd.rp_item_id, kwd.start_time, REMOVED_FOR_WHILE_KEYWORD_LOG.format(number=skipped_kwds_num - 1)
                 )
-            if kwd.status != "FAIL":
-                last_iteration = kwd.skipped_keywords[-1]
-                self._post_skipped_keywords(last_iteration)
-                self._do_end_keyword(last_iteration, ts)
+            last_iteration = kwd.skipped_keywords[-1]
+            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)
 

tests/integration/test_remove_keywords.py

@@ -45,7 +45,7 @@
             "examples/for_keyword_failed.robot",
             "FOR",
             1,
-            ["FAILED"] * 2 + ["PASSED"] + ["FAILED"] * 4,
+            ["PASSED"] + ["FAILED"] * 6,
             3,
             0,
             "1 passing items removed using the --remove-keywords option.",
@@ -54,7 +54,7 @@
             "examples/while_keyword_failed.robot",
             "WHILE",
             1,
-            ["PASSED"] + ["FAILED"] * 2 + ["PASSED"] * 2 + ["FAILED"] * 4,
+            ["PASSED"] * 3 + ["FAILED"] * 6,
             6,
             2,
             "1 passing items removed using the --remove-keywords option.",
@@ -69,13 +69,13 @@
             "1 failing items removed using the --remove-keywords option.",
         ),
         (
-            "examples/wuks_keyword_failed.robot",
-            "WUKS",
-            1,
-            ["PASSED"] * 2 + ["FAILED"] * 6,
-            4,
+            "examples/rkie_keyword.robot",
+            "ALL",
+            0,
+            ["PASSED"] * 4,
+            2,
             0,
-            "2 failing items removed using the --remove-keywords option.",
+            "Content removed using the --remove-keywords option.",
         ),
     ],
 )