Fix logging

Author: HardNorth

robotframework_reportportal/listener.py

@@ -41,7 +41,6 @@
 
 DEFAULT_BINARY_FILE_TYPE = "application/octet-stream"
 TRUNCATION_SIGN = "...'"
-REMOVED_KEYWORD_DATA_LOG = "Keyword data removed using --removeKeywords option."
 REMOVED_KEYWORD_CONTENT_LOG = "Content removed using the --remove-keywords option."
 REMOVED_WKUS_KEYWORD_LOG = "{number} failing items removed using the --remove-keywords option."
 REMOVED_FOR_WHILE_KEYWORD_LOG = "{number} passing items removed using the --remove-keywords option."
@@ -422,23 +421,11 @@ def end_suite(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = None
         :param ts:         Timestamp(used by the ResultVisitor)
         """
         suite = self._remove_current_item().update(attributes)
-        if suite.remove_data and attributes["status"] == "FAIL":
-            self._post_skipped_keywords(suite)
         logger.debug(f"ReportPortal - End Suite: {suite.robot_attributes}")
         self.service.finish_suite(suite=suite, ts=ts)
         if attributes["id"] == MAIN_SUITE_ID:
             self.finish_launch(attributes, ts)
 
-    def _log_data_removed(self, item_id: str, timestamp: str, message: str) -> None:
-        msg = LogMessage(message)
-        msg.level = "DEBUG"
-        msg.item_id = item_id
-        msg.timestamp = timestamp
-        self.__post_log_message(msg)
-
-    def _log_keyword_data_removed(self, item_id: str, timestamp: str) -> None:
-        self._log_data_removed(item_id, timestamp, REMOVED_KEYWORD_DATA_LOG)
-
     @check_rp_enabled
     def start_test(self, name: str, attributes: Dict, ts: Optional[Any] = None) -> None:
         """Start a new test case at the ReportPortal.
@@ -477,6 +464,13 @@ def end_test(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = None)
         self._remove_current_item()
         self.service.finish_test(test=test, ts=ts)
 
+    def _log_data_removed(self, item_id: str, timestamp: str, message: str) -> None:
+        msg = LogMessage(message)
+        msg.level = "DEBUG"
+        msg.item_id = item_id
+        msg.timestamp = timestamp
+        self.__post_log_message(msg)
+
     def _log_keyword_content_removed(self, item_id: str, timestamp: str) -> None:
         self._log_data_removed(item_id, timestamp, REMOVED_KEYWORD_CONTENT_LOG)
 
@@ -572,7 +566,7 @@ def end_keyword(self, _: Optional[str], attributes: Dict, ts: Optional[Any] = No
             if self._remove_all_keyword_content:
                 self._log_keyword_content_removed(kwd.rp_item_id, kwd.start_time)
             elif not self._remove_data_passed_tests:
-                self._log_keyword_data_removed(kwd.rp_item_id, kwd.start_time)
+                self._log_keyword_content_removed(kwd.rp_item_id, kwd.start_time)
 
         self._remove_current_item()
         if not kwd.posted:

tests/integration/test_remove_keywords.py

@@ -233,6 +233,15 @@ def test_remove_keyword_not_provided(mock_client_init):
             0,
             "Keyword 'Fail on first try' failed after retrying 3 times. The last error was: To less executions",
         ),
+        (
+            "examples/binary_file_log_as_image.robot",
+            "tag:binary",
+            0,
+            ["PASSED"] * 3,
+            1,
+            0,
+            "Content removed using the --remove-keywords option.",
+        ),
     ],
 )
 @mock.patch(REPORT_PORTAL_SERVICE)