patch 8.2.3103: swap test may fail on some systems
Problem: Swap test may fail on some systems when jobs take longer to exit.
Solution: Use different file names.
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim
index 013b25c..e62412b 100644
--- a/src/testdir/test_swap.vim
+++ b/src/testdir/test_swap.vim
@@ -502,18 +502,18 @@
" Test for renaming a buffer when the swap file is deleted out-of-band
func Test_missing_swap_file()
CheckUnix
- new Xfile1
+ new Xfile2
call delete(swapname(''))
- call assert_fails('file Xfile2', 'E301:')
- call assert_equal('Xfile2', bufname())
- call assert_true(bufexists('Xfile1'))
+ call assert_fails('file Xfile3', 'E301:')
+ call assert_equal('Xfile3', bufname())
call assert_true(bufexists('Xfile2'))
+ call assert_true(bufexists('Xfile3'))
%bw!
endfunc
" Test for :preserve command
func Test_preserve()
- new Xfile1
+ new Xfile4
setlocal noswapfile
call assert_fails('preserve', 'E313:')
bw!
@@ -521,8 +521,8 @@
" Test for the v:swapchoice variable
func Test_swapchoice()
- call writefile(['aaa', 'bbb'], 'Xfile1')
- edit Xfile1
+ call writefile(['aaa', 'bbb'], 'Xfile5')
+ edit Xfile5
preserve
let swapfname = swapname('')
let b = readblob(swapfname)
@@ -536,7 +536,7 @@
autocmd!
autocmd SwapExists * let v:swapchoice = 'o'
augroup END
- edit Xfile1
+ edit Xfile5
call assert_true(&readonly)
call assert_equal(['aaa', 'bbb'], getline(1, '$'))
%bw!
@@ -548,11 +548,11 @@
autocmd SwapExists * let v:swapchoice = 'a'
augroup END
try
- edit Xfile1
+ edit Xfile5
catch /^Vim:Interrupt$/
endtry
call assert_equal('', @%)
- call assert_true(bufexists('Xfile1'))
+ call assert_true(bufexists('Xfile5'))
%bw!
call assert_true(filereadable(swapfname))
@@ -561,12 +561,12 @@
autocmd!
autocmd SwapExists * let v:swapchoice = 'd'
augroup END
- edit Xfile1
- call assert_equal('Xfile1', @%)
+ edit Xfile5
+ call assert_equal('Xfile5', @%)
%bw!
call assert_false(filereadable(swapfname))
- call delete('Xfile1')
+ call delete('Xfile5')
call delete(swapfname)
augroup test_swapchoice
autocmd!
diff --git a/src/version.c b/src/version.c
index 6192832..a9c2958 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3103,
+/**/
3102,
/**/
3101,