diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-07-04 17:36:54 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-07-04 17:36:54 +0200 |
| commit | f33cae605064c8bdb908a8069d936f752572cd76 (patch) | |
| tree | ba06fa2e3e28c26df065a5887ca6019ad079c4d9 | |
| parent | 3777d6e32b22f0a70b774760c24160079e303bad (diff) | |
| download | vim-git-f33cae605064c8bdb908a8069d936f752572cd76.tar.gz | |
patch 8.2.3103: swap test may fail on some systemsv8.2.3103
Problem: Swap test may fail on some systems when jobs take longer to exit.
Solution: Use different file names.
| -rw-r--r-- | src/testdir/test_swap.vim | 26 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 15 insertions, 13 deletions
diff --git a/src/testdir/test_swap.vim b/src/testdir/test_swap.vim index 013b25caa..e62412b10 100644 --- a/src/testdir/test_swap.vim +++ b/src/testdir/test_swap.vim @@ -502,18 +502,18 @@ endfunc " 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 @@ endfunc " 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 @@ func Test_swapchoice() 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 @@ func Test_swapchoice() 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 @@ func Test_swapchoice() 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 6192832d1..a9c29582a 100644 --- a/src/version.c +++ b/src/version.c @@ -756,6 +756,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3103, +/**/ 3102, /**/ 3101, |