Permalink
Browse files

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.
  • Loading branch information...
brammool committed Feb 1, 2017
1 parent a2f2885 commit e5f2a075e35aa903e8d5a63bef1a438344bba5fb
Showing with 18 additions and 4 deletions.
  1. +5 −1 src/misc1.c
  2. +8 −3 src/testdir/runtest.vim
  3. +3 −0 src/testdir/test_normal.vim
  4. +2 −0 src/version.c
View
@@ -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 */
View
@@ -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()
@@ -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
View
@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 293,
/**/
292,
/**/

0 comments on commit e5f2a07

Please sign in to comment.