0
0
mirror of https://github.com/vim/vim.git synced 2025-10-04 05:25:06 -04:00

patch 9.0.0336: tests are flaky because of using a common file name

Problem:    Tests are flaky because of using a common file name.
Solution:   Rename files and directories to be more unique.
This commit is contained in:
Bram Moolenaar
2022-08-30 21:46:08 +01:00
parent 9b03d3e75b
commit 61abe7d8f8
38 changed files with 175 additions and 173 deletions

View File

@@ -822,8 +822,8 @@ func Test_diff_lastline()
endfunc
func WriteDiffFiles(buf, list1, list2)
call writefile(a:list1, 'Xfile1')
call writefile(a:list2, 'Xfile2')
call writefile(a:list1, 'Xdifile1')
call writefile(a:list2, 'Xdifile2')
if a:buf
call term_sendkeys(a:buf, ":checktime\<CR>")
endif
@@ -877,12 +877,12 @@ func Test_diff_screen()
call writefile(lines, 'XdiffSetup')
" clean up already existing swap files, just in case
call delete('.Xfile1.swp')
call delete('.Xfile2.swp')
call delete('.Xdifile1.swp')
call delete('.Xdifile2.swp')
" Test 1: Add a line in beginning of file 2
call WriteDiffFiles(0, [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10])
let buf = RunVimInTerminal('-d -S XdiffSetup Xfile1 Xfile2', {})
let buf = RunVimInTerminal('-d -S XdiffSetup Xdifile1 Xdifile2', {})
" Set autoread mode, so that Vim won't complain once we re-write the test
" files
call term_sendkeys(buf, ":set autoread\<CR>\<c-w>w:set autoread\<CR>\<c-w>w")
@@ -1000,8 +1000,8 @@ func Test_diff_screen()
" clean up
call StopVimInTerminal(buf)
call delete('Xfile1')
call delete('Xfile2')
call delete('Xdifile1')
call delete('Xdifile2')
call delete('XdiffSetup')
endfunc
@@ -1494,9 +1494,9 @@ endfunc
" for the issue fixed by patch 6.2.317)
func Test_diff_foldinvert()
%bw!
edit Xfile1
new Xfile2
new Xfile3
edit Xdoffile1
new Xdoffile2
new Xdoffile3
windo diffthis
" open a non-diff window
botright new