diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-26 22:00:00 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-26 22:00:00 +0200 |
| commit | ce11de87e26e1420703242f8e07b4fd69c4032ba (patch) | |
| tree | 9c530ed1f58efdaea571722cb7d6d1620792aa27 /src | |
| parent | 15993ce9210e8b8d4bc11e1d640f6447b18d3e6c (diff) | |
| download | vim-ce11de87e26e1420703242f8e07b4fd69c4032ba.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/runtest.vim | 14 | ||||
| -rw-r--r-- | src/testdir/test_filetype.vim | 2 | ||||
| -rw-r--r-- | src/testdir/test_lispwords.vim | 1 | ||||
| -rw-r--r-- | src/testdir/test_tabpage.vim | 3 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 19 insertions, 3 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim index ae45a3eb4..d1593825a 100644 --- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -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() diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 061c3795a..1a427f641 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -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 diff --git a/src/testdir/test_lispwords.vim b/src/testdir/test_lispwords.vim index c7eda8354..4c05504cf 100644 --- a/src/testdir/test_lispwords.vim +++ b/src/testdir/test_lispwords.vim @@ -78,4 +78,5 @@ func Test_lisp_indent() enew! let &cpoptions=save_copt + set nolisp endfunc diff --git a/src/testdir/test_tabpage.vim b/src/testdir/test_tabpage.vim index 239b1b965..95e3c135f 100644 --- a/src/testdir/test_tabpage.vim +++ b/src/testdir/test_tabpage.vim @@ -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 diff --git a/src/version.c b/src/version.c index 88d8995d5..1cb437b21 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1222, +/**/ 1221, /**/ 1220, |