Skip to content

Commit 3f1d61f

Browse files
committed
Fixes
1 parent 1078905 commit 3f1d61f

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

reportportal_client/client.pyi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ class RPClient:
4343
status: Text,
4444
issue: Optional[Issue] = ...,
4545
attributes: List = ...,
46-
**kwargs: Any) -> None: ...
46+
**kwargs: Any) -> Text: ...
4747
def get_item_id_by_uuid(self, uuid: Text) -> Text: ...
4848
def get_launch_info(self) -> Dict: ...
4949
def get_launch_ui_id(self) -> Optional[Dict]: ...

reportportal_client/steps/__init__.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -42,9 +42,8 @@ def get_parent(self):
4242
if len(self.__levels) > 0:
4343
return self.__levels[-1]
4444

45-
def remove_parent(self, parent_id=None):
46-
if len(self.__levels) > 0 \
47-
and (parent_id is None or self.__levels[-1] == parent_id):
45+
def remove_parent(self, parent_id):
46+
if len(self.__levels) > 0 and self.__levels[-1] == parent_id:
4847
return self.__levels.pop()
4948

5049
def start_nested_step(self,
@@ -55,20 +54,20 @@ def start_nested_step(self,
5554
parent_id = self.get_parent()
5655
if parent_id is None:
5756
return
58-
self.client.start_test_item(name, start_time, 'step',
59-
has_stats=False,
60-
parameters=parameters,
61-
parent_item_id=parent_id)
57+
return self.client.start_test_item(name, start_time, 'step',
58+
has_stats=False,
59+
parameters=parameters,
60+
parent_item_id=parent_id)
6261

6362
def finish_nested_step(self,
6463
item_id,
6564
end_time,
6665
status=None,
6766
**kwargs):
68-
parent_id = self.remove_parent(item_id)
69-
if parent_id is None:
67+
if not self.remove_parent(item_id):
7068
return
71-
self.client.finish_test_item(parent_id, end_time, status=status)
69+
result = self.client.finish_test_item(item_id, end_time, status=status)
70+
print(result)
7271

7372

7473
class Step:
@@ -85,7 +84,7 @@ def __enter__(self):
8584
logger.info("Parameters: " + str(self.params))
8685

8786
def __exit__(self, exc_type, exc_val, exc_tb):
88-
step_status = None
87+
step_status = self.status
8988
if any((exc_type, exc_val, exc_tb)):
9089
step_status = 'FAILED'
9190
self.client.step_reporter \
@@ -104,7 +103,8 @@ def wrapper(*args, **kwargs):
104103
return wrapper
105104

106105

107-
def step(func_or_name, name=None, params=None, status=None, rp_client=None):
106+
def step(func_or_name, name=None, params=None, status='PASSED',
107+
rp_client=None):
108108
if callable(func_or_name):
109109
if name is None:
110110
name = func_or_name.__name__

0 commit comments

Comments
 (0)