summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-06-07 17:30:33 +0200
committerBram Moolenaar <Bram@vim.org>2020-06-07 17:30:33 +0200
commitc82dd86084581afa5113b0dd9ade7a631b89b4fc (patch)
treec843529afc938e31da3a1f1945caf3f428cc5c13
parent48af321a3382008dc642362d3f54bb6a61ff36e4 (diff)
downloadvim-git-c82dd86084581afa5113b0dd9ade7a631b89b4fc.tar.gz
patch 8.2.0923: cmdline test is slowv8.2.0923
Problem: Cmdline test is slow. Solution: Use WaitForAssert().
-rw-r--r--src/testdir/test_cmdline.vim6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/testdir/test_cmdline.vim b/src/testdir/test_cmdline.vim
index 94cb8273d..81350aa64 100644
--- a/src/testdir/test_cmdline.vim
+++ b/src/testdir/test_cmdline.vim
@@ -3,6 +3,7 @@
source check.vim
source screendump.vim
source view_util.vim
+source shared.vim
func Test_complete_tab()
call writefile(['testfile'], 'Xtestfile')
@@ -1194,13 +1195,12 @@ func Test_cmdwin_interrupted()
call writefile(lines, 'XTest_cmdwin')
let buf = RunVimInTerminal('-S XTest_cmdwin', {'rows': 18})
- call TermWait(buf, 1000)
" open cmdwin
call term_sendkeys(buf, "q:")
- call TermWait(buf, 500)
+ call WaitForAssert({-> assert_match('-- More --', term_getline(buf, 18))})
" quit more prompt for :smile command
call term_sendkeys(buf, "q")
- call TermWait(buf, 500)
+ call WaitForAssert({-> assert_match('^$', term_getline(buf, 18))})
" execute a simple command
call term_sendkeys(buf, "aecho 'done'\<CR>")
call VerifyScreenDump(buf, 'Test_cmdwin_interrupted', {})
diff --git a/src/version.c b/src/version.c
index 64871c920..5c39aa67d 100644
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 923,
+/**/
922,
/**/
921,