# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1497107703 -7200
# Node ID f0d050a452c54ca66a617cf5e067de9955d24742
# Parent  ea4aba0028b50dc7d082519b57e722a3f5fd2f66
patch 8.0.0633: the client-server test is still a bit flaky

commit https://github.com/vim/vim/commit/60964f68740b8abcbb2d3f0f3aeade21d1bacb22
Author: Bram Moolenaar <Bram@vim.org>
Date:   Sat Jun 10 17:06:16 2017 +0200

    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
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    633,
+/**/
     632,
 /**/
     631,