Skip to content

Aggregate total_failed_with_waiver inline with other summary fields #443

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Ashishsharma1903 wants to merge 1 commit into from
Closed

Aggregate total_failed_with_waiver inline with other summary fields #443

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 5 additions & 25 deletions common/log_parser/bsa/json_to_html.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,30 +278,6 @@ def generate_html(suite_summary, test_results, chart_data, output_html_path, tes
</html>
""")

# Calculate total_failed_with_waiver by summing from each test suite
total_failed_with_waiver = 0
for test_suite in test_results:
ts_summary = test_suite.get('test_suite_summary', {})
total_failed_with_waiver += get_case_insensitive(ts_summary, 'total_failed_with_waiver')

# Compute overall suite_summary from test_results
suite_summary = {
'total_PASSED': 0,
'total_FAILED': 0, # Only counts FAILED without waiver
'total_failed_with_waiver': total_failed_with_waiver,
'total_ABORTED': 0,
'total_SKIPPED': 0,
'total_WARNINGS': 0
}

for test_suite in test_results:
ts_summary = test_suite.get('test_suite_summary', {})
suite_summary['total_PASSED'] += get_case_insensitive(ts_summary, 'total_passed')
suite_summary['total_FAILED'] += get_case_insensitive(ts_summary, 'total_failed')
# 'total_failed_with_waiver' already summed above
suite_summary['total_ABORTED'] += get_case_insensitive(ts_summary, 'total_aborted')
suite_summary['total_SKIPPED'] += get_case_insensitive(ts_summary, 'total_skipped')
suite_summary['total_WARNINGS'] += get_case_insensitive(ts_summary, 'total_warnings')

# Calculate total tests
total_tests = (
Expand Down Expand Up @@ -369,7 +345,11 @@ def get_case_insensitive(d, key, default=0):
for test_suite in test_results:
ts_summary = test_suite.get('test_suite_summary', {})
suite_summary['total_PASSED'] += get_case_insensitive(ts_summary, 'total_passed')
suite_summary['total_FAILED'] += get_case_insensitive(ts_summary, 'total_failed')
suite_summary['total_FAILED'] += max(
0,
get_case_insensitive(ts_summary, 'total_failed') -
get_case_insensitive(ts_summary, 'total_failed_with_waiver')
)
suite_summary['total_failed_with_waiver'] += get_case_insensitive(ts_summary, 'total_failed_with_waiver')
suite_summary['total_ABORTED'] += get_case_insensitive(ts_summary, 'total_aborted')
suite_summary['total_SKIPPED'] += get_case_insensitive(ts_summary, 'total_skipped')
Expand Down