changeset 12696:6daad7ef16be v8.0.1226

patch 8.0.1226: edit and popup tests failing commit https://github.com/vim/vim/commit/2a45d64d0a7ab28d77eee277244e76dbbf8c2db8 Author: Bram Moolenaar <Bram@vim.org> Date: Fri Oct 27 01:35:00 2017 +0200 patch 8.0.1226: edit and popup tests failing Problem: Edit and popup tests failing. Solution: Make the tests pass.
author Christian Brabandt <cb@256bit.org>
date Fri, 27 Oct 2017 01:45:04 +0200
parents ea24919085d3
children 6d76bde47f3e
files src/testdir/test_edit.vim src/testdir/test_popup.vim src/version.c
diffstat 3 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_edit.vim
+++ b/src/testdir/test_edit.vim
@@ -215,14 +215,16 @@ endfunc
 
 func! Test_edit_08()
   " reset insertmode from i_ctrl-r_=
+  let g:bufnr = bufnr('%')
   new
   call setline(1, ['abc'])
   call cursor(1, 4)
-  call feedkeys(":set im\<cr>ZZZ\<c-r>=setbufvar(1,'&im', 0)\<cr>",'tnix')
+  call feedkeys(":set im\<cr>ZZZ\<c-r>=setbufvar(g:bufnr,'&im', 0)\<cr>",'tnix')
   call assert_equal(['abZZZc'], getline(1,'$'))
   call assert_equal([0, 1, 1, 0], getpos('.'))
   call assert_false(0, '&im')
   bw!
+  unlet g:bufnr
 endfunc
 
 func! Test_edit_09()
--- a/src/testdir/test_popup.vim
+++ b/src/testdir/test_popup.vim
@@ -681,7 +681,8 @@ func Test_popup_and_preview_autocommand(
   call setline(2, '                                 os.')
   $
   call feedkeys("A\<C-X>\<C-O>\<C-N>\<C-N>\<C-N>\<enter>\<esc>", 'tx')
-  call assert_equal(["import os", "                                 os.EX_IOERR", ''], getline(1,'$'))
+  call assert_equal("import os", getline(1))
+  call assert_match('                                 os.\(EX_IOERR\|O_CREAT\)$', getline(2))
   call assert_equal(1, winnr('$'))
   " previewwindow option is not set
   call assert_equal(0, &previewwindow)
--- 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 */
 /**/
+    1226,
+/**/
     1225,
 /**/
     1224,