Attribute processing refactoring

Author: HardNorth

pytest_reportportal/service.py

@@ -515,6 +515,7 @@ def _get_issue(self, mark):
         """Add issues description and issue_type to the test item.
 
         :param mark: pytest mark
+        :return: Issue object
         """
         default_url = self._config.rp_issue_system_url
 
@@ -562,29 +563,40 @@ def _get_parameters(self, item):
         """
         return item.callspec.params if hasattr(item, 'callspec') else None
 
-    def _process_attributes(self, leaf):
+    def _process_test_case_id(self, leaf):
         """
-        Process all types of attributes of item.
+        Process Test Case ID if set.
 
         :param leaf: item context
+        :return: Test Case ID string
         """
-        item = leaf['item']
+        for marker in leaf['item'].iter_markers():
+            if marker.name == 'tc_id':
+                return self._get_test_case_id(marker, leaf)
 
-        parameters = self._get_parameters(item)
-        leaf['parameters'] = parameters
+        return self._get_test_case_id(None, leaf)
 
-        code_ref = self._get_code_ref(item)
-        leaf['code_ref'] = code_ref
+    def _process_issue(self, leaf):
+        """
+        Process Issue if set.
 
-        attributes = set()
+        :param leaf: item context
+        :return: Issue
+        """
         for marker in leaf['item'].iter_markers():
-            if marker.name == 'tc_id':
-                test_case_id = self._get_test_case_id(marker, leaf)
-                leaf['test_case_id'] = test_case_id
-                continue
             if marker.name == 'issue':
-                issue = self._get_issue(marker)
-                leaf['issue'] = issue
+                return self._get_issue(marker)
+
+    def _process_attributes(self, item):
+        """
+        Process attributes of item.
+
+        :param item: Pytest.Item
+        :return: a set of attributes
+        """
+        attributes = set()
+        for marker in item.iter_markers():
+            if marker.name == 'issue':
                 if self._config.rp_issue_id_marks:
                     for issue_id in self._get_issue_ids(marker):
                         attributes.add((marker.name, issue_id))
@@ -597,11 +609,28 @@ def _process_attributes(self, leaf):
             else:
                 attributes.add((None, marker.name))
 
-        leaf['attributes'] = [self._to_attribute(attribute)
-                              for attribute in attributes]
+        return [self._to_attribute(attribute)
+                for attribute in attributes]
 
-        if 'test_case_id' not in leaf:
-            leaf['test_case_id'] = self._get_test_case_id(None, leaf)
+    def _process_metadata_item_start(self, leaf):
+        """
+        Process all types of item metadata for its start event.
+
+        :param leaf: item context
+        """
+        item = leaf['item']
+        leaf['parameters'] = self._get_parameters(item)
+        leaf['code_ref'] = self._get_code_ref(item)
+        leaf['test_case_id'] = self._process_test_case_id(leaf)
+        leaf['attributes'] = self._process_attributes(item)
+
+    def _process_metadata_item_finish(self, leaf):
+        """
+        Process all types of item metadata for its finish event.
+
+        :param leaf: item context
+        """
+        leaf['attributes'] = self._process_attributes(leaf['item'])
 
     def _build_start_step_rq(self, leaf):
         payload = {
@@ -647,7 +676,7 @@ def start_pytest_item(self, test_item=None):
         # Details at:
         # https://github.com/reportportal/agent-Python-RobotFramework/issues/56
         current_leaf = self._tree_path[test_item][-1]
-        self._process_attributes(current_leaf)
+        self._process_metadata_item_start(current_leaf)
         item_id = self._start_step(self._build_start_step_rq(current_leaf))
         current_leaf['item_id'] = item_id
         current_leaf['exec'] = ExecStatus.IN_PROGRESS
@@ -742,7 +771,7 @@ def finish_pytest_item(self, test_item):
 
         path = self._tree_path[test_item]
         leaf = path[-1]
-        self._process_attributes(leaf)
+        self._process_metadata_item_finish(leaf)
         self._finish_step(self._build_finish_step_rq(leaf))
         leaf['exec'] = ExecStatus.FINISHED
         self._finish_parents(leaf)