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
index 5212b9b..d0dd04f 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -53,6 +53,10 @@
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 @@
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
index 3b651cc..c3a4779 100644
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 500,
+/**/
499,
/**/
498,