mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-10-26 12:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

test(core/job_spec): fix flakiness (#26623)

Browse Source
This commit is contained in:
zeertzjq
2023-12-18 07:09:32 +08:00
committed by GitHub
parent d82a586a9e
commit 75b8f4c8cb
2 changed files with 22 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/functional/core/job_spec.lua
View File

@@ -1154,17 +1154,26 @@ describe('jobs', function()
]]) ]])
local screen = thelpers.setup_child_nvim({ local screen = thelpers.setup_child_nvim({
'--cmd', 'set notermguicolors',
'-i', 'NONE', '-i', 'NONE',
'-u', filename, '-u', filename,
'+q'
}) })
-- Wait for startup to complete, so that all terminal responses are received.
screen:expect([[
{1: } |
~ |*3
{1:[No Name] 0,0-1 All}|
|
{3:-- TERMINAL --} |
]])
screen:expect{grid=[[ feed(':q<CR>')
screen:expect([[
| |
[Process exited 0]{1: } | [Process exited 0]{1: } |
|*4 |*4
{3:-- TERMINAL --} | {3:-- TERMINAL --} |
]]} ]])
end) end)
end) end)

87
test/functional/ui/popupmenu_spec.lua
View File

@@ -1431,8 +1431,7 @@ describe('builtin popupmenu', function()
feed('<C-N>') feed('<C-N>')
screen:expect([[ screen:expect([[
1info | 1info |
{1:~ }| {1:~ }|*2
{1:~ }|
{3:[Scratch] [Preview] }| {3:[Scratch] [Preview] }|
one^ | one^ |
{s:one }{1: }| {s:one }{1: }|
@@ -1497,28 +1496,11 @@ describe('builtin popupmenu', function()
if multigrid then if multigrid then
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[2:------------------------------]| [2:------------------------------]|*10
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[3:------------------------------]| [3:------------------------------]|
## grid 2 ## grid 2
one^ | one^ |
{1:~ }| {1:~ }|*9
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
## grid 3 ## grid 3
{2:-- }{5:match 1 of 3} | {2:-- }{5:match 1 of 3} |
## grid 4 ## grid 4
@@ -1538,12 +1520,7 @@ describe('builtin popupmenu', function()
{s:one }{n:1info}{1: }| {s:one }{n:1info}{1: }|
{n:two }{1: }| {n:two }{1: }|
{n:three }{1: }| {n:three }{1: }|
{1:~ }| {1:~ }|*6
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{2:-- }{5:match 1 of 3} | {2:-- }{5:match 1 of 3} |
]], unchanged = true} ]], unchanged = true}
end end
@@ -1554,28 +1531,11 @@ describe('builtin popupmenu', function()
if multigrid then if multigrid then
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[2:------------------------------]| [2:------------------------------]|*10
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[3:------------------------------]| [3:------------------------------]|
## grid 2 ## grid 2
three^ | three^ |
{1:~ }| {1:~ }|*9
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
## grid 3 ## grid 3
{2:-- }{5:match 3 of 3} | {2:-- }{5:match 3 of 3} |
## grid 4 ## grid 4
@@ -1595,12 +1555,7 @@ describe('builtin popupmenu', function()
{n:one 3info}{1: }| {n:one 3info}{1: }|
{n:two }{1: }| {n:two }{1: }|
{s:three }{1: }| {s:three }{1: }|
{1:~ }| {1:~ }|*6
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{2:-- }{5:match 3 of 3} | {2:-- }{5:match 3 of 3} |
]]} ]]}
end end
@@ -1615,28 +1570,11 @@ describe('builtin popupmenu', function()
if multigrid then if multigrid then
screen:expect{grid=[[ screen:expect{grid=[[
## grid 1 ## grid 1
[2:------------------------------]| [2:------------------------------]|*10
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[2:------------------------------]|
[3:------------------------------]| [3:------------------------------]|
## grid 2 ## grid 2
itesttesttesttesttesone^t | itesttesttesttesttesone^t |
{1:~ }| {1:~ }|*9
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
## grid 3 ## grid 3
{2:-- }{5:match 1 of 3} | {2:-- }{5:match 1 of 3} |
## grid 5 ## grid 5
@@ -1659,12 +1597,7 @@ describe('builtin popupmenu', function()
{1:~}{n:1info}{1: }{s: one }{1: }| {1:~}{n:1info}{1: }{s: one }{1: }|
{1:~}{n: }{1: }{n: two }{1: }| {1:~}{n: }{1: }{n: two }{1: }|
{1:~ }{n: three }{1: }| {1:~ }{n: three }{1: }|
{1:~ }| {1:~ }|*6
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{1:~ }|
{2:-- }{5:match 1 of 3} | {2:-- }{5:match 1 of 3} |
]]} ]]}
end end