kevin/neovim
1
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-01-02 17:33:28 -07:00
Code Issues Packages Projects Releases Wiki Activity

vim-patch:9.1.0269: Test for TextChanged is still flaky with ASAN

Browse Source 
Problem:  Test for TextChanged is still flaky with ASAN.
Solution: Don't index the result of readfile().
          (zeertzjq)

It turns out that with ASAN the file may become empty during a write
even if it's non-empty both before and after the write, in which case
indexing the result of readfile() will error, so use join() instead.

Also don't delete the file halfway the test, just in case it may cause
errors on the next read.

closes: vim/vim#14421

e9ff79a7c9
This commit is contained in:
zeertzjq 2024-04-06 05:59:04 +08:00
parent f4a0c853db
commit c7d12a5e01
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/old/testdir/test_autocmd.vim
View File

@ -3921,39 +3921,40 @@ func Test_Changed_ChangedI()
\ {'term_rows': 10})
call assert_equal('running', term_getstatus(buf))
call WaitForAssert({-> assert_true(filereadable('XTextChangedI3'))})
defer delete('XTextChangedI3')
call WaitForAssert({-> assert_equal([''], readfile('XTextChangedI3'))})
" TextChanged should trigger if a mapping enters and leaves Insert mode.
call term_sendkeys(buf, "\<CR>")
call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')->join("\n"))})
call term_sendkeys(buf, "i")
call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 10))})
call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N4,', readfile('XTextChangedI3')->join("\n"))})
" TextChangedI should trigger if change is done in Insert mode.
call term_sendkeys(buf, "f")
call WaitForAssert({-> assert_equal('N4,I5', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N4,I5', readfile('XTextChangedI3')->join("\n"))})
call term_sendkeys(buf, "o")
call WaitForAssert({-> assert_equal('N4,I6', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N4,I6', readfile('XTextChangedI3')->join("\n"))})
call term_sendkeys(buf, "o")
call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')->join("\n"))})
" TextChanged shouldn't trigger when leaving Insert mode and TextChangedI
" has been triggered.
call term_sendkeys(buf, "\<Esc>")
call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))})
call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N4,I7', readfile('XTextChangedI3')->join("\n"))})
" TextChanged should trigger if change is done in Normal mode.
call term_sendkeys(buf, "yyp")
call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')->join("\n"))})
" TextChangedI shouldn't trigger if change isn't done in Insert mode.
call term_sendkeys(buf, "i")
call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 10))})
call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')->join("\n"))})
call term_sendkeys(buf, "\<Esc>")
call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))})
call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_equal('N8,I7', readfile('XTextChangedI3')->join("\n"))})
" TextChangedI should trigger if change is a mix of Normal and Insert modes.
func! s:validate_mixed_textchangedi(buf, keys)
@ -3963,13 +3964,13 @@ func Test_Changed_ChangedI()
call term_sendkeys(buf, "\<Esc>")
call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))})
call term_sendkeys(buf, ":let [g:autocmd_n, g:autocmd_i] = ['', '']\<CR>")
call delete('XTextChangedI3')
call writefile([], 'XTextChangedI3')
call term_sendkeys(buf, a:keys)
call WaitForAssert({-> assert_match('^-- INSERT --', term_getline(buf, 10))})
call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')->join("\n"))})
call term_sendkeys(buf, "\<Esc>")
call WaitForAssert({-> assert_notmatch('^-- INSERT --', term_getline(buf, 10))})
call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')[0])})
call WaitForAssert({-> assert_match('^,I\d\+', readfile('XTextChangedI3')->join("\n"))})
endfunc
call s:validate_mixed_textchangedi(buf, "o")
@ -3982,7 +3983,6 @@ func Test_Changed_ChangedI()
" clean up
bwipe!
call delete('XTextChangedI3')
endfunc
" Test that filetype detection still works when SwapExists autocommand sets