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

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.

diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim
index 86dad54d7031119f73b4144d649d661985457255..0f403711d9b49bf2f8176f7e6863a858121f7552 100644 (file)
--- a/src/testdir/test_clientserver.vim
+++ b/src/testdir/test_clientserver.vim
@@ -45,7 +45,7 @@ func Test_client_server()
   call assert_equal('yes', remote_expr(name, "testvar", "", 2))
 
   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.
     " Need to wait for the GUI to start up, otherwise the send hangs in trying
     " to send to the terminal window.
@@ -56,7 +56,9 @@ func Test_client_server()
       call remote_send(name, ":gui -f\<CR>")
     endif
     " Wait for the server to be up and answering requests.
+    sleep 100m
     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 WaitFor('remote_expr("' . name . '", "testvar", "", 1) == "maybe"')

diff --git a/src/version.c b/src/version.c
index 3c7c967a5d1aa88bc7e6c3547fc52eed0a70cc15..eb254043b0227c4bca0073c1c2526dde6a276749 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    633,
 /**/
     632,
 /**/