1
0
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:
Bram Moolenaar
2017-10-26 22:00:00 +02:00
parent 15993ce921
commit ce11de87e2
5 changed files with 19 additions and 3 deletions

View File

@@ -133,7 +133,11 @@ func RunTheTest(test)
endtry endtry
endif 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 while 1
let wincount = winnr('$') let wincount = winnr('$')
if wincount == 1 if wincount == 1
@@ -146,7 +150,15 @@ func RunTheTest(test)
break break
endif endif
endwhile 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 set nomodified
bwipe
endfunc endfunc
func AfterTheTest() func AfterTheTest()

View File

@@ -548,7 +548,7 @@ func Test_script_detection()
for file in files for file in files
call writefile(file, 'Xtest') call writefile(file, 'Xtest')
split Xtest split Xtest
call assert_equal(ft, &filetype) call assert_equal(ft, &filetype, 'for text: ' . string(file))
bwipe! bwipe!
endfor endfor
endfor endfor

View File

@@ -78,4 +78,5 @@ func Test_lisp_indent()
enew! enew!
let &cpoptions=save_copt let &cpoptions=save_copt
set nolisp
endfunc endfunc

View File

@@ -475,6 +475,7 @@ endfunc
func Test_close_on_quitpre() func Test_close_on_quitpre()
" This once caused a crash " This once caused a crash
edit Xtest
new new
only only
set bufhidden=delete set bufhidden=delete
@@ -489,7 +490,7 @@ func Test_close_on_quitpre()
while tabpagenr('$') > 1 while tabpagenr('$') > 1
bwipe! bwipe!
endwhile endwhile
1b buf Xtest
endfunc endfunc
" vim: shiftwidth=2 sts=2 expandtab " vim: shiftwidth=2 sts=2 expandtab

View File

@@ -761,6 +761,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1222,
/**/ /**/
1221, 1221,
/**/ /**/