Skip to content

Fix BSA subtest counting issues in log parsing and compliance calculation #595

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

Merged
chetan-rathore merged 1 commit into from
Dec 15, 2025
Merged

Fix BSA subtest counting issues in log parsing and compliance calculation #595

Show file tree
Hide file tree
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
11 changes: 6 additions & 5 deletions common/log_parser/bsa/logs_to_json.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,14 +152,15 @@ def main(input_files, output_file):
raw_line = lines[i]
i += 1

# Detect indentation level (count leading spaces)
indent_match = re.match(r'^(\s*)', raw_line)
# Strip timestamp [....] if present (keep spaces after timestamp for indentation detection)
line_no_timestamp = re.sub(r'^\s*\[.*?\]\s?', '', raw_line)

# NOW detect indentation level (count leading spaces AFTER timestamp removal)
indent_match = re.match(r'^(\s*)', line_no_timestamp)
indent_spaces = len(indent_match.group(1)) if indent_match else 0
is_indented = indent_spaces > 0

# Strip timestamp [....] if present, but preserve other leading spaces for now
line_no_timestamp = re.sub(r'^\s*\[.*?\]\s*', '', raw_line)
# Now strip only the leading spaces
# Strip the leading spaces to get clean line
line = line_no_timestamp.strip()

if not line:
Expand Down
15 changes: 6 additions & 9 deletions common/log_parser/merge_jsons.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,15 +148,12 @@ def count_fails_in_json(data):
total_failed += 1

# Also count subtests under testcases (BSA structure)
for subtest in testcase.get("subtests", []):
sub_result = subtest.get("sub_test_result", "")
if isinstance(sub_result, str):
if "FAILED" in sub_result.upper() or "FAILURE" in sub_result.upper() or "FAIL" in sub_result.upper():
any_subtests_found = True
if "(WITH WAIVER)" in sub_result.upper():
total_failed_with_waiver += 1
else:
total_failed += 1
subtests_in_testcase = testcase.get("subtests", [])
# Only set flag if subtests array is non-empty
if subtests_in_testcase:
any_subtests_found = True
# NOTE: For BSA, don't count individual subtest failures
# The testcase failure status above already captures it
# Standard structure: subtests at suite level
subtests = suite_entry.get("subtests", [])
if subtests:
Expand Down