diff options
| author | Ivan Frade <ifrade@google.com> | 2024-12-04 14:56:41 -0800 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2025-07-21 17:14:37 +0200 |
| commit | b0e06f3b0a48b20506efede05ffb5f0e882e02a0 (patch) | |
| tree | 20ee7212a79bed460e030d9ae026b5723c1ede4c | |
| parent | cd81b68107f62562a9a66944381042d6082134cc (diff) | |
| download | jgit-b0e06f3b0a48b20506efede05ffb5f0e882e02a0.tar.gz jgit-b0e06f3b0a48b20506efede05ffb5f0e882e02a0.zip | |
MergeToolTest: update expected error from the tool
This test fails in jenkins becuase the error string is slightly
different. It seems to come from an external tool (git mergetool?)
that maybe changed that output (?).
At the moment update the error string to match the output of the
tool. Parsing error messages is bound to be flaky.
Change-Id: I81e9bf65088b893af3a0d8e53d57052583fc2262
| -rw-r--r-- | org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java index 1236dd30d3..c1e1cdf5fc 100644 --- a/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java +++ b/org.eclipse.jgit.pgm.test/tst/org/eclipse/jgit/pgm/MergeToolTest.java @@ -89,7 +89,7 @@ public class MergeToolTest extends ToolTestCase { createMergeConflict(); - String araxisErrorLine = "compare: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1123."; + String araxisErrorLine = "compare-im6.q16: unrecognized option `-wait' @ error/compare.c/CompareImageCommand/1131."; String[] expectedErrorOutput = { araxisErrorLine, araxisErrorLine, }; runAndCaptureUsingInitRaw(Arrays.asList(expectedErrorOutput), MERGE_TOOL, "--no-prompt"); |