To: vim_dev@googlegroups.com Subject: Patch 9.0.0415 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 9.0.0415 Problem: On MS-Windows some tests are flaky. Solution: Add sleeps, disable swapfile, mark test as flaky. (Ken Takata, closes #11082) 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 *** ../vim-9.0.0414/src/testdir/test_autocmd.vim 2022-09-07 21:30:40.143379043 +0100 --- src/testdir/test_autocmd.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 763,768 **** --- 763,769 ---- 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) *** ../vim-9.0.0414/src/testdir/test_buffer.vim 2022-09-05 21:40:40.438306254 +0100 --- src/testdir/test_buffer.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 375,380 **** --- 375,381 ---- func Test_buffer_scheme() CheckMSWindows + set noswapfile set noshellslash %bwipe! let bufnames = [ *************** *** 397,402 **** --- 398,404 ---- endfor set shellslash& + set swapfile& endfunc " this was using a NULL pointer after failing to use the pattern *** ../vim-9.0.0414/src/testdir/test_bufline.vim 2022-09-05 21:40:40.438306254 +0100 --- src/testdir/test_bufline.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 83,88 **** --- 83,89 ---- 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') *** ../vim-9.0.0414/src/testdir/test_profile.vim 2022-04-08 13:15:22.000000000 +0100 --- src/testdir/test_profile.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 53,58 **** --- 53,59 ---- \ . ' -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 *** ../vim-9.0.0414/src/testdir/test_shell.vim 2021-09-01 13:27:48.000000000 +0100 --- src/testdir/test_shell.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 5,10 **** --- 5,15 ---- 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 = [] *** ../vim-9.0.0414/src/testdir/test_undo.vim 2022-08-15 17:28:23.660240894 +0100 --- src/testdir/test_undo.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 335,340 **** --- 335,345 ---- 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 *** ../vim-9.0.0414/src/testdir/test_viminfo.vim 2022-08-29 22:31:15.923685244 +0100 --- src/testdir/test_viminfo.vim 2022-09-08 12:25:29.341756968 +0100 *************** *** 722,727 **** --- 722,728 ---- endfunc func Test_viminfo_oldfiles() + set noswapfile let v:oldfiles = [] let lines = [ \ '# comment line', *************** *** 765,770 **** --- 766,772 ---- call assert_equal("/tmp/another.txt", expand("%")) bwipe delmark E + set swapfile& endfunc " Test for storing and restoring buffer list in 'viminfo' *** ../vim-9.0.0414/src/version.c 2022-09-08 12:17:02.006342437 +0100 --- src/version.c 2022-09-08 12:26:52.781645725 +0100 *************** *** 705,706 **** --- 705,708 ---- { /* Add new patch number below this line */ + /**/ + 415, /**/ -- How To Keep A Healthy Level Of Insanity: 11. Specify that your drive-through order is "to go". /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// \\\ \\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///