Permalink
Browse files

patch 7.4.2149

Problem:    If a test leaves a window open a following test may fail.
Solution:   Always close extra windows after running a test.
  • Loading branch information...
1 parent edf634e commit 7cba71d7e3576639679b6a3aedeeb1ac07f7f2f5 @brammool brammool committed Aug 2, 2016
Showing with 8 additions and 2 deletions.
  1. +6 −0 src/testdir/runtest.vim
  2. +0 −2 src/testdir/test_popup.vim
  3. +2 −0 src/version.c
@@ -103,6 +103,12 @@ function RunTheTest(test)
if exists("*TearDown")
call TearDown()
endif
+
+ " Close any extra windows and make the current one not modified.
+ while winnr('$') > 1
+ bwipe!
+ endwhile
+ set nomodified
endfunc
" Source the test script. First grab the file name, in case the script
@@ -203,7 +203,6 @@ func! Test_popup_complete()
call feedkeys("aM\<f5>\<enter>\<esc>", 'tx')
call assert_equal(["March", "M", "March"], getline(1,4))
%d
- bwipe!
endfu
@@ -233,7 +232,6 @@ func! Test_popup_completion_insertmode()
call feedkeys("a\<f5>\<c-p>\<c-p>\<enter>\<esc>", 'tx')
call assert_equal('December', getline(1))
- bwipe!
iunmap <F5>
endfunc
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2149,
+/**/
2148,
/**/
2147,

0 comments on commit 7cba71d

Please sign in to comment.