summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-09-28 22:11:56 +0200
committerBram Moolenaar <Bram@vim.org>2019-09-28 22:11:56 +0200
commitb7a97ef340f03ca08df8c8e00cd5580f61aac824 (patch)
treef90a42653ca822889eb685700b0068072484603a
parent37ac4a531ce58daa201e3e045ef553734eaa432a (diff)
downloadvim-git-b7a97ef340f03ca08df8c8e00cd5580f61aac824.tar.gz
patch 8.1.2099: state() test fails on some Mac systemsv8.1.2099
Problem: state() test fails on some Mac systems. Solution: Increase the wait time. (closes #4983)
-rw-r--r--src/testdir/test_functions.vim5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/testdir/test_functions.vim b/src/testdir/test_functions.vim
index 878d3436a..4f39d875d 100644
--- a/src/testdir/test_functions.vim
+++ b/src/testdir/test_functions.vim
@@ -1667,6 +1667,7 @@ func Test_state()
let lines =<< trim END
call setline(1, ['one', 'two', 'three'])
map ;; gg
+ set complete=.
func RunTimer()
call timer_start(10, {id -> execute('let g:state = state()') .. execute('let g:mode = mode()')})
endfunc
@@ -1694,9 +1695,9 @@ func Test_state()
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: mSc; mode: n', term_getline(buf, 6))}, 1000)
- " Insert mode completion
+ " Insert mode completion (bit slower on Mac)
call term_sendkeys(buf, ":call RunTimer()\<CR>Got\<C-N>")
- call term_wait(buf, 50)
+ call term_wait(buf, 200)
call term_sendkeys(buf, "\<Esc>")
call term_sendkeys(buf, getstate)
call WaitForAssert({-> assert_match('state: aSc; mode: i', term_getline(buf, 6))}, 1000)
diff --git a/src/version.c b/src/version.c
index 20a028515..28660efcc 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 2099,
+/**/
2098,
/**/
2097,