@@ -42,9 +42,8 @@ def get_parent(self):
42
42
if len (self .__levels ) > 0 :
43
43
return self .__levels [- 1 ]
44
44
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 :
48
47
return self .__levels .pop ()
49
48
50
49
def start_nested_step (self ,
@@ -55,20 +54,20 @@ def start_nested_step(self,
55
54
parent_id = self .get_parent ()
56
55
if parent_id is None :
57
56
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 )
62
61
63
62
def finish_nested_step (self ,
64
63
item_id ,
65
64
end_time ,
66
65
status = None ,
67
66
** kwargs ):
68
- parent_id = self .remove_parent (item_id )
69
- if parent_id is None :
67
+ if not self .remove_parent (item_id ):
70
68
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 )
72
71
73
72
74
73
class Step :
@@ -85,7 +84,7 @@ def __enter__(self):
85
84
logger .info ("Parameters: " + str (self .params ))
86
85
87
86
def __exit__ (self , exc_type , exc_val , exc_tb ):
88
- step_status = None
87
+ step_status = self . status
89
88
if any ((exc_type , exc_val , exc_tb )):
90
89
step_status = 'FAILED'
91
90
self .client .step_reporter \
@@ -104,7 +103,8 @@ def wrapper(*args, **kwargs):
104
103
return wrapper
105
104
106
105
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 ):
108
108
if callable (func_or_name ):
109
109
if name is None :
110
110
name = func_or_name .__name__
0 commit comments