From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 1 Feb 2017 21:31:49 +0000 (+0100)
Subject: patch 8.0.0293: some tests have a one or three second wait
X-Git-Tag: v8.0.0293
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e5f2a075e35aa903e8d5a63bef1a438344bba5fb;p=vim

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.
---

diff --git a/src/misc1.c b/src/misc1.c
index f95c3fe47..2a2d9cf64 100644
--- 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 */
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index 430b89ac2..43192c450 100644
--- 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()
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index 98177851a..3af79f8d0 100644
--- 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
diff --git a/src/version.c b/src/version.c
index 1d83da4d7..0a5e3d329 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    293,
 /**/
     292,
 /**/