step

Author: pillo79

extra/ci_collect_logs.py

@@ -50,7 +50,7 @@ def artifact_count(count, status, icons):
 
 	return f"<code>{count:>3}</code>{icons[status]}"
 
-def example_name(sketch_name):
+def test_name(sketch_name):
 	match = re.search(r'libraries/([^/]+)/(.*)', sketch_name)
 	if match:
 		lib = match.group(1)
@@ -62,7 +62,7 @@ def example_name(sketch_name):
 TEST_MATRIX = {}
 BOARD_SUMMARY = {}
 
-def log_test(name, board, exceptions, status, issues, job_link=None):
+def log_test(board, name, exceptions, status, issues, job_link=None):
 	"""
 	Logs individual test results into the TEST_MATRIX dictionary.
 	"""
@@ -140,14 +140,14 @@ def process_build_reports():
 		# Get raw data from report file
 		REPORT_FILE = f"arduino-{subarch}-{board}.json"
 		if not os.path.exists(REPORT_FILE):
-			log_test('CI test', board, FAILURE, "Report file not found.")
+			log_test(board, 'CI test', exceptions, FAILURE, "Report file not found.")
 			continue # Skip to the next board
 
 		try:
 			with open(REPORT_FILE, 'r') as f:
 				report_data = json.load(f)
 		except Exception as e:
-			log_test('CI test', board, FAILURE, f"Error reading report file: {e}")
+			log_test(board, 'CI test', exceptions, FAILURE, f"Error reading report file: {e}")
 			continue # Skip to the next board
 
 		# Extract data from the report file
@@ -156,7 +156,7 @@ def process_build_reports():
 
 		reports = report_data.get('boards', [{}])[0].get('sketches', [])
 		if not reports:
-			log_test('CI test', board, FAILURE, "Test report is empty, check CI log.", job_link)
+			log_test(board, 'CI test', exceptions, FAILURE, "Test report is empty, check CI log.", job_link)
 			continue # Skip to the next board
 
 		# 7. Sketch Loop: Iterate through individual sketch reports
@@ -175,7 +175,7 @@ def process_build_reports():
 			else:
 				status = PASS
 
-			log_test(SKETCH_NAME, board, status, sketch_issues, job_link)
+			log_test(board, SKETCH_NAME, exceptions, status, sketch_issues, job_link)
 
 	artifacts = set(item['artifact'] for item in ALL_BOARD_DATA)
 
@@ -231,7 +231,7 @@ def process_build_reports():
 
 		# Print the test matrix
 
-		header_row = f"<tr><th colspan='2'><code>${artifact}</code></th>"
+		header_row = f"<tr><th colspan='2'><code>{artifact} tests</code></th>"
 		for board in artifact_boards:
 			status = BOARD_SUMMARY[board]['status']
 			header_col = f"<code>{board}</code>"
@@ -257,7 +257,7 @@ def process_build_reports():
 
 				sketch_status = max(sketch_status, status)
 				row_data += f"<td align='center'>{TEST_STATUS[status]}</td>"
-			name_link = example_name(sketch_name)
+			name_link = test_name(sketch_name)
 			if issues:
 				sketch_id = sketch_name.replace('/', '_').replace(' ', '_').replace('-', '_')
 				name_link =	f"<a href='#user-content-{artifact}_{sketch_id}'>{name_link}</a>"
@@ -298,7 +298,7 @@ def process_build_reports():
 		for sketch_status in [ERROR, EXPECTED_ERROR, WARNING]:
 			for sketch_name, test_log_map in sketch_log_map.get(sketch_status, []):
 				sketch_id = sketch_name.replace('/', '_').replace(' ', '_').replace('-', '_')
-				print(f"<a name='{artifact}_{sketch_id}'/><details name='{artifact}'><summary><code>{artifact}</code> logs for {TEST_STATUS[sketch_status]} {example_name(sketch_name)}</summary>\n")
+				print(f"<a name='{artifact}_{sketch_id}'/><details name='{artifact}'><summary><code>{artifact}</code> logs for {TEST_STATUS[sketch_status]} {test_name(sketch_name)}</summary>\n")
 				print("<table>")
 				for test_status in [ERROR, EXPECTED_ERROR, WARNING]:
 					for text in test_log_map.get(test_status, []):