Skip to content

Commit 4889ad7

Browse files
committed
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.
1 parent c6aafba commit 4889ad7

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

src/testdir/test_quotestar.vim

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,10 @@ func Do_test_quotestar_for_x11()
5353
call WaitFor('serverlist() =~ "' . name . '"')
5454
call assert_match(name, serverlist())
5555

56+
" Wait for the server to be up and answering requests. One second is not
57+
" always sufficient.
58+
call WaitFor('remote_expr("' . name . '", "v:version", "", 2) != ""')
59+
5660
" Clear the *-register of this vim instance.
5761
let @* = ''
5862

@@ -78,8 +82,8 @@ func Do_test_quotestar_for_x11()
7882
else
7983
call remote_send(name, ":gui -f\<CR>")
8084
endif
81-
" Wait for the server to be up and answering requests.
82-
call WaitFor('remote_expr("' . name . '", "v:version", "", 1) != ""')
85+
" Wait for the server in the GUI to be up and answering requests.
86+
call WaitFor('remote_expr("' . name . '", "has(\"gui_running\")", "", 1) =~ "1"')
8387

8488
call remote_send(name, ":let @* = 'maybe'\<CR>")
8589
call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "maybe"')

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -764,6 +764,8 @@ static char *(features[]) =
764764

765765
static int included_patches[] =
766766
{ /* Add new patch number below this line */
767+
/**/
768+
500,
767769
/**/
768770
499,
769771
/**/

0 commit comments

Comments
 (0)