@@ -42,18 +42,26 @@ def get_time(log):
42
42
43
43
@staticmethod
44
44
def assert_time (expected , actual , tolerance = 20 , error_message = "Startup time is not expected." ,
45
- verification_errors = []):
45
+ verification_errors = [], asert_full_time = True ):
46
46
print "Actual startup: " + str (actual )
47
47
print "Expected startup: " + str (expected )
48
48
x = int (expected )
49
49
y = int (actual )
50
- if actual >= 0 :
51
- diff = abs (x - y ) * 1.00
52
- try :
53
- assert diff <= x * tolerance * 0.01 , error_message
54
- except AssertionError , e :
55
- verification_errors .append (str (e ))
56
- return verification_errors
50
+ if asert_full_time :
51
+ if actual >= 0 :
52
+ diff = abs (x - y ) * 1.00
53
+ try :
54
+ assert diff <= x * tolerance * 0.01 , error_message
55
+ except AssertionError , e :
56
+ verification_errors .append (str (e ))
57
+ else :
58
+ if actual >= 0 :
59
+ max_time = x + ((x * tolerance ) * 0.01 )
60
+ try :
61
+ assert y <= max_time , error_message
62
+ except AssertionError , e :
63
+ verification_errors .append (str (e ))
64
+ return verification_errors
57
65
58
66
@staticmethod
59
67
def report_add_column_titles ():
@@ -227,14 +235,16 @@ def test_tns_commands_time(self, demo, config, platform, expected_tns_create_tim
227
235
actual_tns_platform_add_time , expected_tns_build_time , actual_tns_build_time )
228
236
if actual_tns_create_time != 0.0 :
229
237
message = "Tns create project command for platform {1} for {0} with {4} configuration is {3} s. " \
230
- "The expected time is {2} s." .format (demo ,
231
- platform , expected_tns_create_time ,
232
- actual_tns_create_time , config )
238
+ "The expected time is {2} s." .format (demo ,
239
+ platform , expected_tns_create_time ,
240
+ actual_tns_create_time , config )
233
241
if actual_tns_create_time != 0.0 :
234
242
verification_errors = PerfBuildTests .assert_time (expected = expected_tns_create_time ,
235
- actual = actual_tns_create_time ,
236
- tolerance = 25 ,
237
- error_message = message , verification_errors = verification_errors )
243
+ actual = actual_tns_create_time ,
244
+ tolerance = 20 ,
245
+ error_message = message ,
246
+ verification_errors = verification_errors ,
247
+ asert_full_time = False )
238
248
239
249
message = "Tns platform add command for platform {1} for {0} with {4} configuration is {3} s. " \
240
250
"The expected time is {2} s." .format (demo , platform , expected_tns_platform_add_time ,
0 commit comments