Mercurial > vim
changeset 10807:82c43bca568e v8.0.0293
patch 8.0.0293: some tests have a one or three second wait
commit https://github.com/vim/vim/commit/e5f2a075e35aa903e8d5a63bef1a438344bba5fb
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Feb 1 22:31:49 2017 +0100
patch 8.0.0293: some tests have a one or three second wait
Problem: Some tests have a one or three second wait.
Solution: Reset the 'showmode' option. Use a test time of one to disable
sleep after an error or warning message.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Wed, 01 Feb 2017 22:45:04 +0100 |
| parents | 307c5852706c |
| children | 9ac3f25e28af |
| files | src/misc1.c src/testdir/runtest.vim src/testdir/test_normal.vim src/version.c |
| diffstat | 4 files changed, 18 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/misc1.c +++ b/src/misc1.c @@ -3264,7 +3264,11 @@ change_warning( #endif msg_clr_eos(); (void)msg_end(); - if (msg_silent == 0 && !silent_mode) + if (msg_silent == 0 && !silent_mode +#ifdef FEAT_EVAL + && time_for_testing != 1 +#endif + ) { out_flush(); ui_delay(1000L, TRUE); /* give the user time to think about it */
--- a/src/testdir/runtest.vim +++ b/src/testdir/runtest.vim @@ -57,9 +57,6 @@ else set encoding=latin1 endif -" Avoid stopping at the "hit enter" prompt -set nomore - " Output all messages in English. lang mess C @@ -88,6 +85,14 @@ endfunc function RunTheTest(test) echo 'Executing ' . a:test + + " Avoid stopping at the "hit enter" prompt + set nomore + + " Avoid a three second wait when a message is about to be overwritten by the + " mode message. + set noshowmode + if exists("*SetUp") try call SetUp()
--- a/src/testdir/test_normal.vim +++ b/src/testdir/test_normal.vim @@ -2193,6 +2193,8 @@ func! Test_normal51_FileChangedRO() if !has("autocmd") return endif + " Don't sleep after the warning message. + call test_settime(1) call writefile(['foo'], 'Xreadonly.log') new Xreadonly.log setl ro @@ -2202,6 +2204,7 @@ func! Test_normal51_FileChangedRO() call assert_equal('Xreadonly.log', bufname('')) " cleanup + call test_settime(0) bw! call delete("Xreadonly.log") endfunc