Fixes

Author: HardNorth

reportportal_client/__init__.py

@@ -16,8 +16,10 @@
 
 from .service import ReportPortalService
 from .steps import step
+from ._local import current
 
 __all__ = [
     'ReportPortalService',
-    'step'
+    'step',
+    'current'
 ]

reportportal_client/_local/__init__.py

@@ -0,0 +1,24 @@
+#  Copyright (c) 2022 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
+#
+#  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.
+#  See the License for the specific language governing permissions and
+#  limitations under the License
+from threading import local
+
+
+__INSTANCES = local()
+
+
+def current():
+    return __INSTANCES.current
+
+
+def set_current(client):
+    __INSTANCES.current = client

reportportal_client/client.py

@@ -15,7 +15,7 @@
 limitations under the License.
 """
 import logging
-from threading import local
+
 
 import requests
 from requests.adapters import HTTPAdapter
@@ -31,20 +31,11 @@
 from .helpers import uri_join, verify_value_length
 from .static.defines import NOT_FOUND
 from .steps import StepReporter
+from ._local import set_current
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
 
-__INSTANCES = local()
-
-
-def current():
-    return __INSTANCES.current
-
-
-def _set_current(client):
-    __INSTANCES.current = client
-
 
 class RPClient(object):
     """Report portal client.
@@ -81,7 +72,7 @@ def __init__(self,
         :param max_pool_size:        Option to set the maximum number of
                                      connections to save the pool.
         """
-        _set_current(self)
+        set_current(self)
         self._batch_logs = []
         self.api_v1, self.api_v2 = 'v1', 'v2'
         self.endpoint = endpoint

reportportal_client/helpers.py

@@ -171,13 +171,13 @@ def get_function_params(func, args, kwargs):
     # Python 3.10.2
     # noinspection PyDeprecation
     arg_spec = inspect.getargspec(func)
-    result = set()
+    result = dict()
     for i, arg_name in enumerate(arg_spec.args):
         if arg_name in kwargs:
             break
-        result.add((arg_name, str(args[i])))
+        result[arg_name] = str(args[i])
     for arg_name, arg_value in kwargs.items():
-        result.add((str(arg_name), str(arg_value)))
+        result[arg_name] = str(arg_value)
     return result
 
 

reportportal_client/helpers.pyi

@@ -3,7 +3,7 @@ from .errors import EntryCreatedError as EntryCreatedError, \
     ResponseError as ResponseError
 from logging import Logger
 
-from typing import Text, Tuple, Set, Callable, Any, Dict, Optional
+from typing import Text, Tuple, List, Callable, Any, Dict, Optional
 from requests import Response
 
 logger: Logger
@@ -23,6 +23,6 @@ def get_error_messages(data: dict) -> list: ...
 def verify_value_length(attributes: list[dict]) -> list[dict]: ...
 def timestamp() -> Text: ...
 def get_function_params(func: Callable, args: Tuple[Any, ...],
-                        kwargs: Dict[Text, Any]) -> Set[Tuple[Text, Text]]: ...
+                        kwargs: Dict[Text, Any]) -> Dict[Text, Text]: ...
 def evaluate_status(current_status:Optional[Text],
                     child_status:Optional[Text]) -> Text: ...

reportportal_client/steps/__init__.py

@@ -13,17 +13,15 @@
 import logging
 from functools import wraps
 
-from reportportal_client import client
+from reportportal_client._local import current
 from reportportal_client.helpers import get_function_params, evaluate_status, \
     timestamp
 from reportportal_client.static.defines import ItemStartType, NOT_FOUND
 
-NESTED_STEP_ITEMS = (ItemStartType.STEP, ItemStartType.SCENARIO,
-                     ItemStartType.BEFORE_CLASS, ItemStartType.BEFORE_GROUPS,
-                     ItemStartType.BEFORE_METHOD, ItemStartType.BEFORE_SUITE,
-                     ItemStartType.BEFORE_TEST, ItemStartType.AFTER_TEST,
-                     ItemStartType.AFTER_SUITE, ItemStartType.AFTER_CLASS,
-                     ItemStartType.AFTER_GROUPS, ItemStartType.AFTER_METHOD)
+NESTED_STEP_ITEMS = ('step', 'scenario', 'before_class', 'before_groups',
+                     'before_method', 'before_suite', 'before_test',
+                     'after_test', 'after_suite', 'after_class',
+                     'after_groups', 'after_method')
 
 logger = logging.getLogger(__name__)
 logger.addHandler(logging.NullHandler())
@@ -37,20 +35,16 @@ def __init__(self, rp_client):
 
     def set_parent(self, item_type, parent_id):
         if parent_id is not NOT_FOUND:
-            if str(item_type).upper() in NESTED_STEP_ITEMS:
+            if item_type.lower() in NESTED_STEP_ITEMS:
                 self.__levels.append(parent_id)
 
     def get_parent(self):
         if len(self.__levels) > 0:
             return self.__levels[-1]
 
     def remove_parent(self, parent_id=None):
-        if parent_id is NOT_FOUND:
-            return
-        if parent_id is not None:
-            if self.__levels[-1] != parent_id:
-                return
-        return self.__levels.pop()
+        if len(self.__levels) > 0 and self.__levels[-1] == parent_id:
+            return self.__levels.pop()
 
     def start_nested_step(self,
                           name,
@@ -60,7 +54,7 @@ def start_nested_step(self,
         parent_id = self.get_parent()
         if parent_id is None:
             return
-        self.client.start_test_item(name, start_time, ItemStartType.STEP,
+        self.client.start_test_item(name, start_time, 'step',
                                     has_stats=False,
                                     parameters=parameters,
                                     parent_item_id=parent_id)
@@ -80,7 +74,7 @@ def __init__(self, name, params, status, rp_client):
         self.name = name
         self.params = params
         self.status = status
-        self.client = rp_client if rp_client is not None else client.current()
+        self.client = rp_client if rp_client is not None else current()
 
     def __enter__(self):
         self.client.step_reporter \