CPU consumption fix, missed Test Case ID bypass fix

Author: HardNorth

reportportal_client/client.py

@@ -15,6 +15,7 @@
 limitations under the License.
 """
 import logging
+
 import requests
 from requests.adapters import HTTPAdapter
 
@@ -113,7 +114,7 @@ def finish_launch(self,
     def finish_test_item(self,
                          item_id,
                          end_time,
-                         status,
+                         status=None,
                          issue=None,
                          attributes=None,
                          description=None,
@@ -125,7 +126,7 @@ def finish_test_item(self,
         :param end_time:    Test item end time
         :param status:      Test status. Allowable values: "passed",
                             "failed", "stopped", "skipped", "interrupted",
-                            "cancelled"
+                            "cancelled" or None
         :param attributes:  Test item attributes(tags). Pairs of key and value.
                             Overrides attributes on start
         :param description: Test item description. Overrides description
@@ -276,24 +277,27 @@ def start_test_item(self,
                         has_stats=True,
                         code_ref=None,
                         retry=False,
+                        test_case_id=None,
                         **kwargs):
         """Start case/step/nested step item.
 
-        :param name:        Name of the test item
-        :param start_time:  Test item start time
-        :param item_type:   Type of the test item. Allowable values: "suite",
-                            "story", "test", "scenario", "step",
-                            "before_class", "before_groups", "before_method",
-                            "before_suite", "before_test", "after_class",
-                            "after_groups", "after_method", "after_suite",
-                            "after_test"
-        :param attributes:  Test item attributes
-        :param code_ref:    Physical location of the test item
-        :param description: Test item description
-        :param has_stats:   Set to False if test item is nested step
-        :param parameters:  Set of parameters (for parametrized test items)
-        :param retry:       Used to report retry of the test. Allowable values:
-                            "True" or "False"
+        :param name:           Name of the test item
+        :param start_time:     Test item start time
+        :param item_type:      Type of the test item. Allowable values:
+                               "suite", "story", "test", "scenario", "step",
+                               "before_class", "before_groups",
+                               "before_method", "before_suite",
+                               "before_test", "after_class", "after_groups",
+                               "after_method", "after_suite", "after_test"
+        :param attributes:     Test item attributes
+        :param code_ref:       Physical location of the test item
+        :param description:    Test item description
+        :param has_stats:      Set to False if test item is nested step
+        :param parameters:     Set of parameters (for parametrized test items)
+        :param parent_item_id: An ID of a parent SUITE / STEP
+        :param retry:          Used to report retry of the test. Allowable
+                               values: "True" or "False"
+        :param test_case_id: A unique ID of the current step
         """
         if parent_item_id:
             url = uri_join(self.base_url_v2, 'item', parent_item_id)
@@ -309,7 +313,8 @@ def start_test_item(self,
             description=description,
             has_stats=has_stats,
             parameters=parameters,
-            retry=retry
+            retry=retry,
+            test_case_id=test_case_id
         ).payload
         response = HttpRequest(self.session.post,
                                url=url,

reportportal_client/core/log_manager.py

@@ -1,10 +1,10 @@
 """This module contains management functionality for processing logs.
 
-Copyright (c) 2018 http://reportportal.io .
+Copyright (c) 2018 https://reportportal.io .
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
-http://www.apache.org/licenses/LICENSE-2.0
+https://www.apache.org/licenses/LICENSE-2.0
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,7 +14,6 @@
 
 import logging
 from threading import Lock
-from time import sleep
 
 from six.moves import queue
 
@@ -26,7 +25,6 @@
 )
 from reportportal_client.core.worker import APIWorker
 
-
 logger = logging.getLogger(__name__)
 
 
@@ -51,8 +49,7 @@ def __init__(self, rp_url, session, api_version, launch_id, project_name,
         self._logs_batch = []
         self._worker = None
         self.api_version = api_version
-        self.command_queue = queue.Queue()
-        self.data_queue = queue.PriorityQueue()
+        self.queue = queue.PriorityQueue()
         self.launch_id = launch_id
         self.log_batch_size = log_batch_size
         self.project_name = project_name
@@ -81,7 +78,7 @@ def _send_batch(self):
             self.session.post, self._log_endpoint, files=batch.payload,
             verify_ssl=self.verify_ssl)
         batch.http_request = http_request
-        self._worker.send_request(batch)
+        self._worker.send(batch)
         self._logs_batch.clear()
 
     def log(self, time, message=None, level=None, attachment=None,
@@ -102,20 +99,19 @@ def log(self, time, message=None, level=None, attachment=None,
     def start(self):
         """Create a new instance of the Worker class and start it."""
         if not self._worker:
-            self._worker = APIWorker(self.command_queue, self.data_queue)
-            self._worker.start()
+            # the worker might be already created in case of deserialization
+            self._worker = APIWorker(self.queue)
+        self._worker.start()
 
     def stop(self):
         """Send last batches to the worker followed by the stop command."""
         if self._worker:
             with self._lock:
                 if self._logs_batch:
                     self._send_batch()
-                self._worker.stop()
                 logger.debug('Waiting for worker {0} to complete'
                              'processing batches.'.format(self._worker))
-                while self._worker.is_alive():
-                    sleep(0.1)
+                self._worker.stop()
 
     def stop_force(self):
         """Send stop immediate command to the worker."""

reportportal_client/core/log_manager.pyi

@@ -21,8 +21,7 @@ class LogManager:
     _logs_batch: List = ...
     _worker: Optional[APIWorker] = ...
     api_version: Text = ...
-    command_queue: queue.Queue = ...
-    data_queue: queue.PriorityQueue = ...
+    queue: queue.PriorityQueue = ...
     launch_id: Text = ...
     log_batch_size: int = ...
     project_name: Text = ...

reportportal_client/core/rp_issues.py

@@ -109,7 +109,7 @@ def __init__(self,
     def payload(self):
         """Form the correct dictionary for the BTS issue."""
         return {
-            'brsUrl': self.bts_url,
+            'btsUrl': self.bts_url,
             'btsProject': self.bts_project,
             'submitDate': self.submit_date,
             'ticketId': self.ticket_id,

reportportal_client/core/rp_requests.py

@@ -340,8 +340,9 @@ def payload(self):
         """Get HTTP payload for the request."""
         if self.attributes and isinstance(self.attributes, dict):
             self.attributes = dict_to_payload(self.attributes)
-        if self.issue is None and self.status.lower() == 'skipped' and not \
-                self.is_skipped_an_issue:
+        if self.issue is None and (
+                self.status is not None and self.status.lower() == 'skipped'
+        ) and not self.is_skipped_an_issue:
             issue_payload = {'issue_type': 'NOT_ISSUE'}
         else:
             issue_payload = None