From 8c11db21a2f8f1a208c8f7032cd1c4b0050d6e1f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 18 Nov 2021 08:20:50 +0100 Subject: [PATCH] [FIX] forwardport: merge error message change in git Apparently 2.34: * flipped around the "auto-merging" and "CONFLICT" messages on stdout, so just match the second one with wildcards around to ignore the location of the first * changed the casing and content of everything after the `error` line on stderr, so just ignore it all (none of it's actually useful anyway) --- forwardport/tests/test_updates.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/forwardport/tests/test_updates.py b/forwardport/tests/test_updates.py index 5c5f60d9..9a35c96a 100644 --- a/forwardport/tests/test_updates.py +++ b/forwardport/tests/test_updates.py @@ -393,15 +393,13 @@ WARNING: the update of {pr2_id.display_name} to {pr2_id.head} has caused a \ conflict in this pull request, data may have been lost. stdout: -``` -CONFLICT \(add/add\): Merge conflict in h -Auto-merging h +```.*? +CONFLICT \(add/add\): Merge conflict in h.*? ``` stderr: ``` \\d{{2}}:\\d{{2}}:\\d{{2}}.\\d+ .* {pr2_id.head} error: could not apply [0-9a-f]+\\.\\.\\. newfiles -hint: after resolving the conflicts, mark the corrected paths -.*''', re.DOTALL)) +''', re.DOTALL)) ]