more nested step tests

Author: HardNorth

reportportal_client/steps/__init__.py

@@ -120,7 +120,7 @@ def __enter__(self):
         """Enter the runtime context related to this object."""
         # Cannot call _local.current() early since it will be initialized
         # before client put something in there
-        rp_client = self.client if self.client else current()
+        rp_client = self.client or current()
         if not rp_client:
             return
         self.__item_id = rp_client.step_reporter \
@@ -138,7 +138,7 @@ def __exit__(self, exc_type, exc_val, exc_tb):
         """Exit the runtime context related to this object."""
         # Cannot call _local.current() early since it will be initialized
         # before client put something in there
-        rp_client = self.client if self.client else current()
+        rp_client = self.client or current()
         if not rp_client:
             return
         # Avoid failure in case if 'rp_client' was 'None' on function start

tests/steps/test_steps.py

@@ -194,3 +194,12 @@ def test_two_level_nested_step_decorator(rp_client):
     assert first_id.startswith('post-')
     assert second_id.startswith('post-')
     assert first_id != second_id
+
+
+def test_verify_manual_client_bypass_step(rp_client):
+    set_current(None)
+    rp_client._item_stack.append(PARENT_STEP_ID)
+    with step(NESTED_STEP_NAME, rp_client=rp_client):
+        pass
+    assert rp_client.session.post.call_count == 1
+    assert rp_client.session.put.call_count == 1