patch 9.0.0958: messages test is flaky

Problem:    Messages test is flaky.
Solution:   Add a short delay.

diff --git a/src/testdir/dumps/Test_verbose_system_1.vim b/src/testdir/dumps/Test_verbose_system_1.vim
index 816a55ae1bd83de2748cac25d12f0e69e7990009..65e9c8a37867bb3cc66c28d1d4d741b1ab016531 100644 (file)
--- a/src/testdir/dumps/Test_verbose_system_1.vim
+++ b/src/testdir/dumps/Test_verbose_system_1.vim
@@ -1,3 +1,5 @@
 " Filter that removes the ever changing temp directory name from the screendump
 " that shows the system() command executed.
-1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+
+" This should be on the first line, but if it isn't there ignore the error,
+" the screendump will then show the problem.
+1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e

diff --git a/src/testdir/dumps/Test_verbose_system_2.vim b/src/testdir/dumps/Test_verbose_system_2.vim
index 816a55ae1bd83de2748cac25d12f0e69e7990009..65e9c8a37867bb3cc66c28d1d4d741b1ab016531 100644 (file)
--- a/src/testdir/dumps/Test_verbose_system_2.vim
+++ b/src/testdir/dumps/Test_verbose_system_2.vim
@@ -1,3 +1,5 @@
 " Filter that removes the ever changing temp directory name from the screendump
 " that shows the system() command executed.
-1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+
+" This should be on the first line, but if it isn't there ignore the error,
+" the screendump will then show the problem.
+1s+|t|m|p|/|.|.|.*| |+|t|m|p|/|x|x|x|x|x|x|x|/|1| |+e

diff --git a/src/testdir/test_messages.vim b/src/testdir/test_messages.vim
index ab33caad5277ec215eb3ff21d0ba82a1e124373c..ff705fe85f94f37cbe09c55f3a63c6c12815802d 100644 (file)
--- a/src/testdir/test_messages.vim
+++ b/src/testdir/test_messages.vim
@@ -349,7 +349,7 @@ func Test_echo_verbose_system()
 
   " display a page and go back, results in exactly the same view
   call term_sendkeys(buf, ' ')
-  call TermWait(buf)
+  call TermWait(buf, 50)
   call term_sendkeys(buf, 'b')
   call VerifyScreenDump(buf, 'Test_verbose_system_1', {})
 
@@ -362,7 +362,7 @@ func Test_echo_verbose_system()
   call VerifyScreenDump(buf, 'Test_verbose_system_2', {})
 
   call term_sendkeys(buf, ' ')
-  call TermWait(buf)
+  call TermWait(buf, 50)
   call term_sendkeys(buf, 'b')
   call VerifyScreenDump(buf, 'Test_verbose_system_2', {})
 

diff --git a/src/version.c b/src/version.c
index 5d6a2a42d3b85b1f80b46ecfb72feeca6e70f4b3..115c5991acef1d85d7a35475dca33c38b2718566 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -695,6 +695,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    958,
 /**/
     957,
 /**/