GithubBackup/httprunner
1
0
Fork 0
mirror of https://github.com/httprunner/httprunner.git synced 2026-05-22 00:29:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

change: code format

Browse Source
This commit is contained in:
debugtalk
2019-10-26 22:29:30 +08:00
parent 3f456104bf
commit 670bfd88e4
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
httprunner/report.py
View File

@@ -80,16 +80,15 @@ def aggregate_stat(origin_stat, new_stat):
for key in new_stat: for key in new_stat:
if key not in origin_stat: if key not in origin_stat:
origin_stat[key] = new_stat[key] origin_stat[key] = new_stat[key]
elif key == "start_at":
# start datetime
origin_stat["start_at"] = min(origin_stat["start_at"], new_stat["start_at"])
elif key == "duration": elif key == "duration":
# duration = max_end_time - min_start_time # duration = max_end_time - min_start_time
max_end_time = max(origin_stat["start_at"] + origin_stat["duration"], max_end_time = max(origin_stat["start_at"] + origin_stat["duration"],
new_stat["start_at"] + new_stat["duration"]) new_stat["start_at"] + new_stat["duration"])
min_start_time = min(origin_stat["start_at"], new_stat["start_at"]) min_start_time = min(origin_stat["start_at"], new_stat["start_at"])
origin_stat["duration"] = max_end_time - min_start_time origin_stat["duration"] = max_end_time - min_start_time
elif key == "start_at":
# start datetime
origin_stat["start_at"] = min(origin_stat["start_at"], new_stat["start_at"])
else: else:
origin_stat[key] += new_stat[key] origin_stat[key] += new_stat[key]