From 73c7a8fd286146dcc3e907160ac8b38a10839d2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= Date: Sat, 19 Jul 2025 18:28:36 +0200 Subject: [PATCH] Fix #14026 (CI: test_valueflow_debug in test/cli/other_test.py is flaky in macos-15) --- test/cli/other_test.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/test/cli/other_test.py b/test/cli/other_test.py index f66325820df..db057dcaf46 100644 --- a/test/cli/other_test.py +++ b/test/cli/other_test.py @@ -1133,10 +1133,9 @@ def test_valueflow_debug(tmpdir): assert exitcode == 0, stdout if stdout else stderr if sys.platform == "win32": stdout = stdout.replace('/', '\\') - assert stdout == '''Checking {} ... - - -##file {} + assert f'Checking {test_file_cpp} ...' in stdout + stdout = stdout.replace(f'Checking {test_file_cpp} ...\n', '').strip() + assert stdout == '''##file {} 2: void f2 ( ) 3: {{ 4: int i@var1 ; i@var1 = 0 ; @@ -1175,8 +1174,8 @@ def test_valueflow_debug(tmpdir): File {} Line 6 = always 0 - 0 always 0 -'''.format(test_file_cpp, test_file_h_2, test_file_h, test_file_cpp, test_file_h_2, test_file_h, test_file_cpp) + 0 always 0'''.format(test_file_h_2, test_file_h, test_file_cpp, + test_file_h_2, test_file_h, test_file_cpp) assert stderr == ''