diff options
| author | Ryooooooga <eial5q265e5@gmail.com> | 2023-03-22 23:02:32 +0900 |
|---|---|---|
| committer | Stefan Haller <stefan@haller-berlin.de> | 2023-07-10 15:09:17 +0200 |
| commit | 85f7aa9d7bef5f3a82be38e1decf345049aa7bb6 (patch) | |
| tree | 05a45a29fb8359c4eb4ba97a1db8219b473e2f4b /pkg/integration | |
| parent | 30ce7c8085b0ca67d84451ad8607116c9e038fae (diff) | |
Fix conflict test
The test apply_in_reverse_with_conflict.go fails in git versions 2.30.8 and
earlier. Apparently the output "Applied patch to 'file2' cleanly" was only added
more recently. It's not essential that we check this output.
Diffstat (limited to 'pkg/integration')
| -rw-r--r-- | pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go index f767ba3a0..74dd34b3e 100644 --- a/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go +++ b/pkg/integration/tests/patch_building/apply_in_reverse_with_conflict.go @@ -55,8 +55,7 @@ var ApplyInReverseWithConflict = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Alert(). Title(Equals("Error")). - Content(Contains("Applied patch to 'file1' with conflicts."). - Contains("Applied patch to 'file2' cleanly.")). + Content(Contains("Applied patch to 'file1' with conflicts.")). Confirm() t.Views().Files(). |