From: Russell Keith-Magee <russell@keith-magee.com>
Date: Sat, 25 Jan 2025 08:49:39 +0000 (+0800)
Subject: gh-129248: Filter out the iOS log prefix from testbed runner output. (#129252)
X-Git-Tag: v3.14.0a5~245
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a58083811a51764c47fbb7cbd67e87e1124d53e8;p=thirdparty%2FPython%2Fcpython.git

gh-129248: Filter out the iOS log prefix from testbed runner output. (#129252)

Filter out the iOS log prefix from testbed runner output.
---

diff --git a/Misc/NEWS.d/next/Tools-Demos/2025-01-24-14-49-40.gh-issue-129248.JAapG2.rst b/Misc/NEWS.d/next/Tools-Demos/2025-01-24-14-49-40.gh-issue-129248.JAapG2.rst
new file mode 100644
index 000000000000..e3c781cf10cf
--- /dev/null
+++ b/Misc/NEWS.d/next/Tools-Demos/2025-01-24-14-49-40.gh-issue-129248.JAapG2.rst
@@ -0,0 +1,2 @@
+The iOS test runner now strips the log prefix from each line output by the
+test suite.
diff --git a/iOS/testbed/__main__.py b/iOS/testbed/__main__.py
index 068272835a5b..b4499f5ac171 100644
--- a/iOS/testbed/__main__.py
+++ b/iOS/testbed/__main__.py
@@ -2,6 +2,7 @@ import argparse
 import asyncio
 import json
 import plistlib
+import re
 import shutil
 import subprocess
 import sys
@@ -12,6 +13,18 @@ from pathlib import Path
 
 DECODE_ARGS = ("UTF-8", "backslashreplace")
 
+# The system log prefixes each line:
+#   2025-01-17 16:14:29.090 Df iOSTestbed[23987:1fd393b4] (Python) ...
+#   2025-01-17 16:14:29.090 E  iOSTestbed[23987:1fd393b4] (Python) ...
+
+LOG_PREFIX_REGEX = re.compile(
+    r"^\d{4}-\d{2}-\d{2}"  # YYYY-MM-DD
+    r"\s+\d+:\d{2}:\d{2}\.\d+"  # HH:MM:SS.sss
+    r"\s+\w+"  # Df/E
+    r"\s+iOSTestbed\[\d+:\w+\]"  # Process/thread ID
+    r"\s+\(Python\)\s"  # Logger name
+)
+
 
 # Work around a bug involving sys.exit and TaskGroups
 # (https://github.com/python/cpython/issues/101515).
@@ -131,6 +144,8 @@ async def log_stream_task(initial_devices):
     ) as process:
         suppress_dupes = False
         while line := (await process.stdout.readline()).decode(*DECODE_ARGS):
+            # Strip the prefix from each log line
+            line = LOG_PREFIX_REGEX.sub("", line)
             # The iOS log streamer can sometimes lag; when it does, it outputs
             # a warning about messages being dropped... often multiple times.
             # Only print the first of these duplicated warnings.