File tree Expand file tree Collapse file tree 2 files changed +17
-0
lines changed
Misc/NEWS.d/next/Tools-Demos Expand file tree Collapse file tree 2 files changed +17
-0
lines changed Original file line number Diff line number Diff line change
1
+ The iOS test runner now strips the log prefix from each line output by the
2
+ test suite.
Original file line number Diff line number Diff line change 2
2
import asyncio
3
3
import json
4
4
import plistlib
5
+ import re
5
6
import shutil
6
7
import subprocess
7
8
import sys
13
14
14
15
DECODE_ARGS = ("UTF-8" , "backslashreplace" )
15
16
17
+ # The system log prefixes each line:
18
+ # 2025-01-17 16:14:29.090 Df iOSTestbed[23987:1fd393b4] (Python) ...
19
+ # 2025-01-17 16:14:29.090 E iOSTestbed[23987:1fd393b4] (Python) ...
20
+
21
+ LOG_PREFIX_REGEX = re .compile (
22
+ r"^\d{4}-\d{2}-\d{2}" # YYYY-MM-DD
23
+ r"\s+\d+:\d{2}:\d{2}\.\d+" # HH:MM:SS.sss
24
+ r"\s+\w+" # Df/E
25
+ r"\s+iOSTestbed\[\d+:\w+\]" # Process/thread ID
26
+ r"\s+\(Python\)\s" # Logger name
27
+ )
28
+
16
29
17
30
# Work around a bug involving sys.exit and TaskGroups
18
31
# (https://github.com/python/cpython/issues/101515).
@@ -132,6 +145,8 @@ async def log_stream_task(initial_devices):
132
145
) as process :
133
146
suppress_dupes = False
134
147
while line := (await process .stdout .readline ()).decode (* DECODE_ARGS ):
148
+ # Strip the prefix from each log line
149
+ line = LOG_PREFIX_REGEX .sub ("" , line )
135
150
# The iOS log streamer can sometimes lag; when it does, it outputs
136
151
# a warning about messages being dropped... often multiple times.
137
152
# Only print the first of these duplicated warnings.
You can’t perform that action at this time.
0 commit comments