changeset 11227:9bfae04699c3 v8.0.0500

patch 8.0.0500: quotestar test is still a bit flaky commit https://github.com/vim/vim/commit/4889ad7c6cd46368f553cc1140ca17508e8beaaa Author: Bram Moolenaar <Bram@vim.org> Date: Tue Mar 21 18:02:41 2017 +0100 patch 8.0.0500: quotestar test is still a bit flaky Problem: Quotestar test is still a bit flaky. Solution: Add a slower check for v:version.
author Christian Brabandt <cb@256bit.org>
date Tue, 21 Mar 2017 18:15:04 +0100
parents fa5b6fccc7c7
children 641b98249145
files src/testdir/test_quotestar.vim src/version.c
diffstat 2 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -53,6 +53,10 @@ func Do_test_quotestar_for_x11()
   call WaitFor('serverlist() =~ "' . name . '"')
   call assert_match(name, serverlist())
 
+  " Wait for the server to be up and answering requests.  One second is not
+  " always sufficient.
+  call WaitFor('remote_expr("' . name . '", "v:version", "", 2) != ""')
+
   " Clear the *-register of this vim instance.
   let @* = ''
 
@@ -78,8 +82,8 @@ func Do_test_quotestar_for_x11()
     else
       call remote_send(name, ":gui -f\<CR>")
     endif
-    " Wait for the server to be up and answering requests.
-    call WaitFor('remote_expr("' . name . '", "v:version", "", 1) != ""')
+    " Wait for the server in the GUI to be up and answering requests.
+    call WaitFor('remote_expr("' . name . '", "has(\"gui_running\")", "", 1) =~ "1"')
 
     call remote_send(name, ":let @* = 'maybe'\<CR>")
     call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "maybe"')
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    500,
+/**/
     499,
 /**/
     498,