Mercurial > vim
changeset 30158:008808e60963 v9.0.0415
patch 9.0.0415: on MS-Windows some tests are flaky
Commit: https://github.com/vim/vim/commit/0500e87eba7b2a82392dbb5d573de19f8ff138e7
Author: K.Takata <kentkt@csc.jp>
Date: Thu Sep 8 12:28:02 2022 +0100
patch 9.0.0415: on MS-Windows some tests are flaky
Problem: On MS-Windows some tests are flaky.
Solution: Add sleeps, disable swapfile, mark test as flaky. (Ken Takata,
closes #11082)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 08 Sep 2022 13:30:05 +0200 |
| parents | ff2d85c28e76 |
| children | b3fe6af68a96 |
| files | src/testdir/test_autocmd.vim src/testdir/test_buffer.vim src/testdir/test_bufline.vim src/testdir/test_profile.vim src/testdir/test_shell.vim src/testdir/test_undo.vim src/testdir/test_viminfo.vim src/version.c |
| diffstat | 8 files changed, 19 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/src/testdir/test_autocmd.vim +++ b/src/testdir/test_autocmd.vim @@ -763,6 +763,7 @@ func Test_autocmd_bufwipe_in_SessLoadPos call writefile(content, 'Xvimrc', 'D') call system(GetVimCommand('Xvimrc') .. ' --not-a-term --noplugins -S Session.vim -c cq') + sleep 50m let errors = join(readfile('Xerrors')) call assert_match('E814:', errors)
--- a/src/testdir/test_buffer.vim +++ b/src/testdir/test_buffer.vim @@ -375,6 +375,7 @@ endfunc func Test_buffer_scheme() CheckMSWindows + set noswapfile set noshellslash %bwipe! let bufnames = [ @@ -397,6 +398,7 @@ func Test_buffer_scheme() endfor set shellslash& + set swapfile& endfunc " this was using a NULL pointer after failing to use the pattern
--- a/src/testdir/test_bufline.vim +++ b/src/testdir/test_bufline.vim @@ -83,6 +83,7 @@ func Test_setline_startup() endif call writefile(['call setline(1, "Hello")', 'silent w Xtest', 'q!'], 'Xscript', 'D') call system(cmd) + sleep 50m call assert_equal(['Hello'], readfile('Xtest')) call delete('Xtest')
--- a/src/testdir/test_profile.vim +++ b/src/testdir/test_profile.vim @@ -53,6 +53,7 @@ func RunProfileFunc(command, declare, as \ . ' -c "qall!"') call assert_equal(0, v:shell_error) + sleep 50m let lines = readfile('Xprofile_func.log') " - Foo1() is called 3 times but should be reported as called twice
--- a/src/testdir/test_shell.vim +++ b/src/testdir/test_shell.vim @@ -5,6 +5,11 @@ source check.vim source shared.vim func Test_shell_options() + if has('win32') + " FIXME: This test is flaky on MS-Windows. + let g:test_is_flaky = 1 + endif + " The expected value of 'shellcmdflag', 'shellpipe', 'shellquote', " 'shellredir', 'shellxescape', 'shellxquote' for the supported shells. let shells = []
--- a/src/testdir/test_undo.vim +++ b/src/testdir/test_undo.vim @@ -335,6 +335,11 @@ func Test_insert_expr() endfunc func Test_undofile_earlier() + if has('win32') + " FIXME: This test is flaky on MS-Windows. + let g:test_is_flaky = 1 + endif + " Issue #1254 " create undofile with timestamps older than Vim startup time. let t0 = localtime() - 43200
--- a/src/testdir/test_viminfo.vim +++ b/src/testdir/test_viminfo.vim @@ -722,6 +722,7 @@ func Test_viminfo_file_mark_unloaded_buf endfunc func Test_viminfo_oldfiles() + set noswapfile let v:oldfiles = [] let lines = [ \ '# comment line', @@ -765,6 +766,7 @@ func Test_viminfo_oldfiles() call assert_equal("/tmp/another.txt", expand("%")) bwipe delmark E + set swapfile& endfunc " Test for storing and restoring buffer list in 'viminfo'