Fixes

Author: HardNorth

reportportal_client/_local/__init__.py

@@ -17,7 +17,8 @@
 
 
 def current():
-    return __INSTANCES.current
+    if hasattr(__INSTANCES, 'current'):
+        return __INSTANCES.current
 
 
 def set_current(client):

reportportal_client/steps/__init__.py

@@ -74,15 +74,19 @@ 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 current()
+        self.client = rp_client if rp_client else current()
         self.__item_id = None
 
     def __enter__(self):
+        if not self.client:
+            return
         self.__item_id = self.client.step_reporter \
             .start_nested_step(self.name, timestamp(), parameters=self.params)
         logger.info("Parameters: " + str(self.params))
 
     def __exit__(self, exc_type, exc_val, exc_tb):
+        if not self.__item_id:
+            return
         step_status = self.status
         if any((exc_type, exc_val, exc_tb)):
             step_status = 'FAILED'
@@ -102,11 +106,8 @@ def wrapper(*args, **kwargs):
         return wrapper
 
 
-def step(func_or_name, name=None, params=None, status='PASSED',
-         rp_client=None):
-    if callable(func_or_name):
-        if name is None:
-            name = func_or_name.__name__
-        return Step(name, params, status, rp_client)(func_or_name)
-    else:
-        return Step(func_or_name, params, status, rp_client)
+def step(name_source, params=None, status='PASSED', rp_client=None):
+    if callable(name_source):
+        name = name_source.__name__
+        return Step(name, params, status, rp_client)(name_source)
+    return Step(str(name_source), params, status, rp_client)

reportportal_client/steps/__init__.pyi

@@ -46,6 +46,7 @@ class Step:
     params: Dict = ...
     status: Text = ...
     client: RPClient = ...
+    __item_id: Optional[Text] = ...
 
     def __init__(self,
                  name: Text,
@@ -60,8 +61,7 @@ class Step:
     def __call__(self, func: Callable) -> Callable: ...
 
 
-def step(func_or_name: Union[Callable, Text],
-         name: Text = ...,
+def step(name_source: Union[Callable, Text],
          params: Dict = ...,
          status: Text = ...,
-         rp_client: RPClient = ...) -> None: ...
+         rp_client: RPClient = ...) -> Step: ...

tests/steps/test_steps.py

@@ -31,3 +31,23 @@ def test_nested_steps_reported_with_parent(rp_client):
         print("Hello nested steps")
     assert rp_client.session.post.call_count == 1
     assert rp_client.session.put.call_count == 1
+
+
+def test_nested_step_name(rp_client):
+    rp_client.step_reporter.set_parent('STEP', PARENT_STEP_ID)
+
+    with step(NESTED_STEP_NAME, rp_client=rp_client):
+        print("Hello nested steps")
+
+    assert rp_client.session.post.call_args[1]['json']['name'] == \
+           NESTED_STEP_NAME
+
+
+def test_nested_step_times(rp_client):
+    rp_client.step_reporter.set_parent('STEP', PARENT_STEP_ID)
+
+    with step(NESTED_STEP_NAME, rp_client=rp_client):
+        print("Hello nested steps")
+
+    assert rp_client.session.post.call_args[1]['json']['startTime']
+    assert rp_client.session.put.call_args[1]['json']['endTime']