aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-08 06:04:08 -04:00
Code Activity

patch 8.0.0633: the client-server test is still a bit flaky

Browse Source 
Problem:    The client-server test is still a bit flaky.
Solution:   Wait a bit for the GUI to start.  Check that the version number
            can be obtained.
This commit is contained in:
Bram Moolenaar
2017-06-10 17:06:16 +02:00
parent 1c13c0fe3e
commit 60964f6874
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/testdir/test_clientserver.vim
View File

@@ -45,7 +45,7 @@ func Test_client_server()
call assert_equal('yes', remote_expr(name, "testvar", "", 2)) call assert_equal('yes', remote_expr(name, "testvar", "", 2))
if has('unix') && has('gui') && !has('gui_running') if has('unix') && has('gui') && !has('gui_running')
" Running in a terminal and the GUI is avaiable: Tell the server to open " Running in a terminal and the GUI is available: Tell the server to open
" the GUI and check that the remote command still works. " the GUI and check that the remote command still works.
" Need to wait for the GUI to start up, otherwise the send hangs in trying " Need to wait for the GUI to start up, otherwise the send hangs in trying
" to send to the terminal window. " to send to the terminal window.
@@ -56,7 +56,9 @@ func Test_client_server()
call remote_send(name, ":gui -f\<CR>") call remote_send(name, ":gui -f\<CR>")
endif endif
" Wait for the server to be up and answering requests. " Wait for the server to be up and answering requests.
sleep 100m
call WaitFor('remote_expr("' . name . '", "v:version", "", 1) != ""') call WaitFor('remote_expr("' . name . '", "v:version", "", 1) != ""')
call assert_true(remote_expr(name, "v:version", "", 1) != "")
call remote_send(name, ":let testvar = 'maybe'\<CR>") call remote_send(name, ":let testvar = 'maybe'\<CR>")
call WaitFor('remote_expr("' . name . '", "testvar", "", 1) == "maybe"') call WaitFor('remote_expr("' . name . '", "testvar", "", 1) == "maybe"')

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
633,
/**/ /**/
632, 632,
/**/ /**/