From 095ae1bd525cfee4cd57f943047d226575528aeb Mon Sep 17 00:00:00 2001 From: Sven Hoexter Date: Fri, 13 Nov 2026 16:11:54 +0100 Subject: [PATCH] tests: Match exfatprogs multiline version output Starting with exfatprogs 1.4.4 we see a multiline version output on stderr and stdout: $ /usr/sbin/mkfs.exfat --version > /dev/null exfatprogs version : 1.4.4 (2026-11-10) $ /usr/sbin/mkfs.exfat --version 2> /dev/null libblkid version : 2.42.4 (21-Sep-2026) $ /usr/sbin/mkfs.exfat --version exfatprogs version : 1.4.4 (2026-11-10) libblkid version : 2.42.4 (21-Sep-2026) Let the regex search on multiple lines from stdout and stderr to find the one containing the exfatprogs version. Signed-off-by: Sven Hoexter --- tests/fs_tests/exfat_test.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/fs_tests/exfat_test.py b/tests/fs_tests/exfat_test.py index 7183577c..c28dceaa 100644 --- a/tests/fs_tests/exfat_test.py +++ b/tests/fs_tests/exfat_test.py @@ -16,7 +16,14 @@ def _get_exfatprogs_version(): _ret, out, _err = utils.run_command("mkfs.exfat --version") # exfatprogs version : 1.4.1 (2026-05-28) - m = re.search(r"exfatprogs version : ([\d\.]+)", out) + # as of 1.4.4 - exfatprogs version via stderr, libblkid version on stdout: + # exfatprogs version : 1.4.4 (2026-11-10) + # libblkid version : 2.42.4 (21-Sep-2026) + m = re.search( + r"^exfatprogs version : ([\d\.]+)", + "\n".join((out, _err)), + re.MULTILINE + ) if not m or len(m.groups()) != 1: raise RuntimeError("Failed to determine exfatprogs version from: %s" % out) return Version(m.groups()[0])