forked from aniani/vim
patch 8.0.1222: test functions interfere with each other
Problem: Test functions interfere with each other. Solution: Cleanup tab pages, windows and buffers. Reset option.
This commit is contained in:
@@ -133,7 +133,11 @@ func RunTheTest(test)
|
||||
endtry
|
||||
endif
|
||||
|
||||
" Close any extra windows and make the current one not modified.
|
||||
" Close any extra tab pages and windows and make the current one not modified.
|
||||
while tabpagenr('$') > 1
|
||||
bwipe!
|
||||
endwhile
|
||||
|
||||
while 1
|
||||
let wincount = winnr('$')
|
||||
if wincount == 1
|
||||
@@ -146,7 +150,15 @@ func RunTheTest(test)
|
||||
break
|
||||
endif
|
||||
endwhile
|
||||
|
||||
" Wipe out all buffers except the current one, then wipe the current one.
|
||||
for nr in range(1, bufnr('$'))
|
||||
if nr != bufnr('%') && bufexists(nr)
|
||||
exe nr . 'bwipe!'
|
||||
endif
|
||||
endfor
|
||||
set nomodified
|
||||
bwipe
|
||||
endfunc
|
||||
|
||||
func AfterTheTest()
|
||||
|
@@ -548,7 +548,7 @@ func Test_script_detection()
|
||||
for file in files
|
||||
call writefile(file, 'Xtest')
|
||||
split Xtest
|
||||
call assert_equal(ft, &filetype)
|
||||
call assert_equal(ft, &filetype, 'for text: ' . string(file))
|
||||
bwipe!
|
||||
endfor
|
||||
endfor
|
||||
|
@@ -78,4 +78,5 @@ func Test_lisp_indent()
|
||||
|
||||
enew!
|
||||
let &cpoptions=save_copt
|
||||
set nolisp
|
||||
endfunc
|
||||
|
@@ -475,6 +475,7 @@ endfunc
|
||||
|
||||
func Test_close_on_quitpre()
|
||||
" This once caused a crash
|
||||
edit Xtest
|
||||
new
|
||||
only
|
||||
set bufhidden=delete
|
||||
@@ -489,7 +490,7 @@ func Test_close_on_quitpre()
|
||||
while tabpagenr('$') > 1
|
||||
bwipe!
|
||||
endwhile
|
||||
1b
|
||||
buf Xtest
|
||||
endfunc
|
||||
|
||||
" vim: shiftwidth=2 sts=2 expandtab
|
||||
|
@@ -761,6 +761,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
1222,
|
||||
/**/
|
||||
1221,
|
||||
/**/
|
||||
|
Reference in New Issue
Block a user