# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1490116504 -3600
# Node ID 9bfae04699c38cac0a2c35400a1f46f79ffa2b5a
# Parent  fa5b6fccc7c7c1f1faaa59f23b90112437161cb2
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.

diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
--- 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"')
diff --git a/src/version.c b/src/version.c
--- 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,