patch 8.0.1536: quotestar test is flaky when using the GUI
Problem: Quotestar test is flaky when using the GUI.
Solution: Add check that the star register arrived at the server. Increase
timeouts.
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim
index cc975be..3a8fdef 100644
--- a/src/testdir/test_quotestar.vim
+++ b/src/testdir/test_quotestar.vim
@@ -65,24 +65,23 @@
" Takes a short while for the server to be active.
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 @* = ''
-
- " Try to change the *-register of the server.
+ " Clear the *-register of this vim instance and wait for it to be picked up
+ " by the server.
+ let @* = 'no'
call remote_foreground(name)
+ call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "no"', 3000)
+
+ " Set the * register on the server.
call remote_send(name, ":let @* = 'yes'\<CR>")
- call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"')
- call assert_equal('yes', remote_expr(name, "@*", "", 2))
+ call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "yes"', 3000)
" Check that the *-register of this vim instance is changed as expected.
- call WaitFor('@* == "yes"')
- call assert_equal('yes', @*)
+ call WaitFor('@* == "yes"', 3000)
" Handle the large selection over 262040 byte.
let length = 262044
diff --git a/src/version.c b/src/version.c
index 5d8eb5a..b2a2e8f 100644
--- a/src/version.c
+++ b/src/version.c
@@ -779,6 +779,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1536,
+/**/
1535,
/**/
1534,