Skip to content

Commit

Permalink
vim-patch:8.2.3102: test for crash fix does not fail without the fix
Browse files Browse the repository at this point in the history 
Problem:    Test for crash fix does not fail without the fix.
Solution:   Adjust the test sequence. (closes vim/vim#8506)
vim/vim@3777d6e

Cherry-pick CheckUnix from patch 8.2.1432.
  • Loading branch information
@zeertzjq
zeertzjq committed Aug 31, 2022
1 parent 5ff2ea6 commit c93a38d
Show file tree
Hide file tree
Showing 3 changed files with 120 additions and 31 deletions.
24 changes: 13 additions & 11 deletions src/nvim/testdir/test_swap.vim
View file
Original file line number Diff line number Diff line change
Expand Up @@ -375,24 +375,26 @@ func Test_swap_prompt_splitwin()
call WaitForAssert({-> assert_match('^1$', term_getline(buf, 20))})
call StopVimInTerminal(buf)

" This caused Vim to crash when typing "q".
" TODO: it does not actually reproduce the crash.
call writefile(['au BufAdd * set virtualedit=all'], 'Xvimrc')

let buf = RunVimInTerminal('-u Xvimrc Xfile1', {'rows': 20, 'wait_for_ruler': 0})
call TermWait(buf)
call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 20))})
" This caused Vim to crash when typing "q" at the swap file prompt.
let buf = RunVimInTerminal('-c "au bufadd * let foo_w = wincol()"', {'rows': 18})
call term_sendkeys(buf, ":e Xfile1\<CR>")
call WaitForAssert({-> assert_match('More', term_getline(buf, 18))})
call term_sendkeys(buf, " ")
call WaitForAssert({-> assert_match('^\[O\]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort:', term_getline(buf, 18))})
call term_sendkeys(buf, "q")
call TermWait(buf)
" check that Vim is still running
call term_sendkeys(buf, ":echo 'hello'\<CR>")
call WaitForAssert({-> assert_match('^hello', term_getline(buf, 18))})
call term_sendkeys(buf, ":%bwipe!\<CR>")
call StopVimInTerminal(buf)

%bwipe!
call delete('Xfile1')
call delete('Xvimrc')
endfunc

func Test_swap_symlink()
if !has("unix")
return
endif
CheckUnix

call writefile(['text'], 'Xtestfile')
silent !ln -s -f Xtestfile Xtestlink
Expand Down
124 changes: 105 additions & 19 deletions test/functional/ex_cmds/swapfile_preserve_recover_spec.lua
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,17 @@
local Screen = require('test.functional.ui.screen')
local helpers = require('test.functional.helpers')(after_each)
local lfs = require('lfs')
local eq, eval, expect, source =
helpers.eq, helpers.eval, helpers.expect, helpers.source
local eq, eval, expect, exec =
helpers.eq, helpers.eval, helpers.expect, helpers.exec
local assert_alive = helpers.assert_alive
local clear = helpers.clear
local command = helpers.command
local feed = helpers.feed
local nvim_prog = helpers.nvim_prog
local ok = helpers.ok
local rmdir = helpers.rmdir
local new_argv = helpers.new_argv
local pesc = helpers.pesc
local os_kill = helpers.os_kill
local set_session = helpers.set_session
local spawn = helpers.spawn
Expand Down Expand Up @@ -55,11 +57,11 @@ describe(':preserve', function()
set swapfile fileformat=unix undolevels=-1
]]

source(init)
exec(init)
command('edit! '..testfile)
feed('isometext<esc>')
command('preserve')
source('redir => g:swapname | silent swapname | redir END')
exec('redir => g:swapname | silent swapname | redir END')

local swappath1 = eval('g:swapname')

Expand All @@ -69,12 +71,12 @@ describe(':preserve', function()
true)
set_session(nvim2)

source(init)
exec(init)

-- Use the "SwapExists" event to choose the (R)ecover choice at the dialog.
command('autocmd SwapExists * let v:swapchoice = "r"')
command('silent edit! '..testfile)
source('redir => g:swapname | silent swapname | redir END')
exec('redir => g:swapname | silent swapname | redir END')

local swappath2 = eval('g:swapname')

Expand All @@ -92,25 +94,28 @@ end)

describe('swapfile detection', function()
local swapdir = lfs.currentdir()..'/Xtest_swapdialog_dir'
local nvim0
-- Put swapdir at the start of the 'directory' list. #1836
-- Note: `set swapfile` *must* go after `set directory`: otherwise it may
-- attempt to create a swapfile in different directory.
local init = [[
set directory^=]]..swapdir:gsub([[\]], [[\\]])..[[//
set swapfile fileformat=unix undolevels=-1 hidden
]]
before_each(function()
clear()
nvim0 = spawn(new_argv())
set_session(nvim0)
rmdir(swapdir)
lfs.mkdir(swapdir)
end)
after_each(function()
set_session(nvim0)
command('%bwipeout!')
rmdir(swapdir)
end)

it('always show swapfile dialog #8840 #9027', function()
local testfile = 'Xtest_swapdialog_file1'
-- Put swapdir at the start of the 'directory' list. #1836
-- Note: `set swapfile` *must* go after `set directory`: otherwise it may
-- attempt to create a swapfile in different directory.
local init = [[
set directory^=]]..swapdir:gsub([[\]], [[\\]])..[[//
set swapfile fileformat=unix undolevels=-1 hidden
]]

local expected_no_dialog = '^'..(' '):rep(256)..'|\n'
for _=1,37 do
Expand All @@ -119,19 +124,17 @@ describe('swapfile detection', function()
expected_no_dialog = expected_no_dialog..testfile..(' '):rep(216)..'0,0-1 All|\n'
expected_no_dialog = expected_no_dialog..(' '):rep(256)..'|\n'

source(init)
exec(init)
command('edit! '..testfile)
feed('isometext<esc>')
command('preserve')

os_kill(eval('getpid()'))
-- Start another Nvim instance.
local nvim2 = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'},
true)
local nvim2 = spawn({nvim_prog, '-u', 'NONE', '-i', 'NONE', '--embed'}, true, nil, true)
set_session(nvim2)
local screen2 = Screen.new(256, 40)
screen2:attach()
source(init)
exec(init)

-- With shortmess+=F
command('set shortmess+=F')
Expand Down Expand Up @@ -176,5 +179,88 @@ describe('swapfile detection', function()
}
})
feed('<cr>')

nvim2:close()
end)

-- oldtest: Test_swap_prompt_splitwin()
it('selecting "q" in the attention prompt', function()
exec(init)
command('edit Xfile1')
command('preserve') -- should help to make sure the swap file exists

local screen = Screen.new(75, 18)
screen:set_default_attr_ids({
[0] = {bold = true, foreground = Screen.colors.Blue}, -- NonText
[1] = {bold = true, foreground = Screen.colors.SeaGreen}, -- MoreMsg
})

local nvim1 = spawn(new_argv(), true, nil, true)
set_session(nvim1)
screen:attach()
exec(init)
feed(':split Xfile1\n')
screen:expect({
any = pesc('{1:[O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: }^')
})
feed('q')
feed(':<CR>')
screen:expect([[
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
: |
]])
nvim1:close()

local nvim2 = spawn(new_argv(), true, nil, true)
set_session(nvim2)
screen:attach()
exec(init)
command('set more')
command('au bufadd * let foo_w = wincol()')
feed(':e Xfile1<CR>')
screen:expect({any = pesc('{1:-- More --}^')})
feed('<Space>')
screen:expect({
any = pesc('{1:[O]pen Read-Only, (E)dit anyway, (R)ecover, (Q)uit, (A)bort: }^')
})
feed('q')
command([[echo 'hello']])
screen:expect([[
^ |
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
{0:~ }|
hello |
]])
nvim2:close()
end)
end)
3 changes: 2 additions & 1 deletion test/functional/legacy/cmdline_spec.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ local command = helpers.command
local feed = helpers.feed
local feed_command = helpers.feed_command
local exec = helpers.exec
local pesc = helpers.pesc

describe('cmdline', function()
before_each(clear)
Expand Down Expand Up @@ -158,7 +159,7 @@ describe('cmdwin', function()
command('set more')
command('autocmd WinNew * highlight')
feed('q:')
screen:expect({any = '{3:%-%- More %-%-}^'})
screen:expect({any = pesc('{3:-- More --}^')})
feed('q')
screen:expect([[
|
Expand Down

0 comments on commit c93a38d

Please sign in to comment.