# HG changeset patch # User Bram Moolenaar # Date 1670195706 -3600 # Node ID 97bb0811cfd44165758205150baced3d1ff7af4c # Parent 60cf6899a082a25941eff3d9a5361814c5fde7ec patch 9.0.1005: a failed test may leave a swap file behind Commit: https://github.com/vim/vim/commit/d0f8d39d20f8d42f7451f781f7be0bcd20e06741 Author: Bram Moolenaar Date: Sun Dec 4 23:00:41 2022 +0000 patch 9.0.1005: a failed test may leave a swap file behind Problem: A failed test may leave a swap file behind. Solution: Delete the swap file to avoid another test to fail. Use another file name. diff --git a/src/testdir/test_suspend.vim b/src/testdir/test_suspend.vim --- a/src/testdir/test_suspend.vim +++ b/src/testdir/test_suspend.vim @@ -24,6 +24,9 @@ func Test_suspend() call WaitForResponses() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + let buf = term_start('/bin/sh') " Wait for shell prompt. call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) @@ -62,6 +65,7 @@ func Test_suspend() exe buf . 'bwipe!' call delete('Xfoo') + call delete('.Xfoo.swp') endfunc func Test_suspend_autocmd() @@ -70,6 +74,9 @@ func Test_suspend_autocmd() call WaitForResponses() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + let buf = term_start('/bin/sh', #{term_rows: 6}) " Wait for shell prompt. call WaitForAssert({-> assert_match('[$#] $', term_getline(buf, '.'))}) @@ -108,6 +115,7 @@ func Test_suspend_autocmd() exe buf . 'bwipe!' call delete('Xfoo') + call delete('.Xfoo.swp') endfunc " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/testdir/test_syntax.vim b/src/testdir/test_syntax.vim --- a/src/testdir/test_syntax.vim +++ b/src/testdir/test_syntax.vim @@ -455,7 +455,7 @@ func Test_invalid_name() endfunc func Test_ownsyntax() - new Xfoo + new XfooOwnSyntax call setline(1, '#define FOO') syntax on set filetype=c diff --git a/src/testdir/test_tagjump.vim b/src/testdir/test_tagjump.vim --- a/src/testdir/test_tagjump.vim +++ b/src/testdir/test_tagjump.vim @@ -733,6 +733,9 @@ endfunc " Tests for guessing the tag location func Test_tag_guess() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile(["!_TAG_FILE_ENCODING\tutf-8\t//", \ "func1\tXfoo\t/^int func1(int x)/", \ "func2\tXfoo\t/^int func2(int y)/", @@ -769,6 +772,9 @@ endfunc " Test for an unsorted tags file func Test_tag_sort() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + let l = [ \ "first\tXfoo\t1", \ "ten\tXfoo\t3", @@ -796,6 +802,9 @@ endfunc " Test for an unsorted tags file func Test_tag_fold() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "!_TAG_FILE_SORTED\t2\t/0=unsorted, 1=sorted, 2=foldcase/", @@ -822,6 +831,9 @@ endfunc " Test for the :ltag command func Test_ltag() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo\t1", @@ -859,6 +871,9 @@ endfunc " Test for setting the last search pattern to the tag search pattern " when cpoptions has 't' func Test_tag_last_search_pat() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo\t/^int first() {}/", @@ -887,6 +902,9 @@ endfunc " Tag stack tests func Test_tag_stack() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + let l = [] for i in range(10, 31) let l += ["var" .. i .. "\tXfoo\t/^int var" .. i .. ";$/"] @@ -949,6 +967,9 @@ endfunc " Test for browsing multiple matching tags func Test_tag_multimatch() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo\t1", @@ -994,6 +1015,9 @@ endfunc " Test for previewing multiple matching tags func Test_preview_tag_multimatch() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo\t1", @@ -1042,6 +1066,9 @@ endfunc " Test for jumping to multiple matching tags across multiple :tags commands func Test_tnext_multimatch() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo1\t1", @@ -1069,6 +1096,9 @@ endfunc " Test for jumping to multiple matching tags in non-existing files func Test_multimatch_non_existing_files() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo1\t1", @@ -1086,6 +1116,9 @@ func Test_multimatch_non_existing_files( endfunc func Test_tselect_listing() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + call writefile([ \ "!_TAG_FILE_ENCODING\tutf-8\t//", \ "first\tXfoo\t1" .. ';"' .. "\tv\ttyperef:typename:int\tfile:", @@ -1467,6 +1500,9 @@ endfunc " Test for 'tagbsearch' (binary search) func Test_tagbsearch() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + " If a tags file header says the tags are sorted, but the tags are actually " unsorted, then binary search should fail and linear search should work. call writefile([ diff --git a/src/testdir/test_tcl.vim b/src/testdir/test_tcl.vim --- a/src/testdir/test_tcl.vim +++ b/src/testdir/test_tcl.vim @@ -638,6 +638,9 @@ endfunc " Test $buf delcmd {cmd} (command executed when buffer is deleted) func Test_buffer_delcmd() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + new Xfoo split tcl $::vim::current(buffer) delcmd [list set msg "buffer deleted"] diff --git a/src/testdir/test_termcodes.vim b/src/testdir/test_termcodes.vim --- a/src/testdir/test_termcodes.vim +++ b/src/testdir/test_termcodes.vim @@ -665,6 +665,9 @@ func Test_term_mouse_click_tab() set mouse=a term=xterm call WaitForResponses() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') + let row = 1 for ttymouse_val in g:Ttymouse_values + g:Ttymouse_dec + g:Ttymouse_netterm diff --git a/src/testdir/test_window_cmd.vim b/src/testdir/test_window_cmd.vim --- a/src/testdir/test_window_cmd.vim +++ b/src/testdir/test_window_cmd.vim @@ -137,6 +137,8 @@ endfunc " Test the ":wincmd ^" and "^" commands. func Test_window_split_edit_alternate() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') " Test for failure when the alternate buffer/file no longer exists. edit Xfoo | %bw @@ -170,6 +172,8 @@ endfunc " Test the ":[count]wincmd ^" and "[count]^" commands. func Test_window_split_edit_bufnr() + " in case a previous failure left a swap file behind + call delete('.Xfoo.swp') %bwipeout let l:nr = bufnr('%') + 1 diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -696,6 +696,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1005, +/**/ 1004, /**/ 1003,