mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-06-08 06:24:34 +02:00
0632bc9c12
backport fixes for: - https://github.com/neovim/neovim/issues/33669 - https://github.com/neovim/neovim/issues/33892 Disable a few functional tests that appear to be flaky.
29 lines
1.3 KiB
Diff
29 lines
1.3 KiB
Diff
From da4d30e40c3476394c10b2d5d0363678153405f9 Mon Sep 17 00:00:00 2001
|
|
From: zeertzjq <zeertzjq@outlook.com>
|
|
Date: Thu, 8 May 2025 07:51:23 +0800
|
|
Subject: [PATCH] test(swapfile): don't check for line with full file path
|
|
(#33896)
|
|
|
|
Wrapping can happen anywhere where in the full file path, breaking the
|
|
matching. Match a line with the "Xswaptest" line instead.
|
|
|
|
(cherry picked from commit 1b8ae4336db86ff95998223cc6bd8e07229d237d)
|
|
---
|
|
test/functional/ex_cmds/swapfile_preserve_recover_spec.lua | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
|
|
index 8eec02524ea52e..e1ce4343f3cd70 100644
|
|
--- a/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
|
|
+++ b/test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
|
|
@@ -450,8 +450,8 @@ pcall(vim.cmd.edit, 'Xtest_swapredraw.lua')
|
|
screen:expect({
|
|
any = table.concat({
|
|
pesc('{2:E325: ATTENTION}'),
|
|
- 'file name: .*Xswaptest',
|
|
- 'process ID: %d* %(STILL RUNNING%)',
|
|
+ '\n process ID: %d* %(STILL RUNNING%)',
|
|
+ '\nWhile opening file "Xswaptest"',
|
|
pesc('{1:[O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: }^'),
|
|
}, '.*'),
|
|
})
|