diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-10 17:06:16 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-10 17:06:16 +0200 |
| commit | 60964f68740b8abcbb2d3f0f3aeade21d1bacb22 (patch) | |
| tree | 2674c5aec40c66a65fa1f658438d0f5d322edade | |
| parent | 1c13c0fe3e7b15750464ffbc39a4648aa5c639be (diff) | |
| download | vim-git-60964f68740b8abcbb2d3f0f3aeade21d1bacb22.tar.gz | |
patch 8.0.0633: the client-server test is still a bit flakyv8.0.0633
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.
| -rw-r--r-- | src/testdir/test_clientserver.vim | 4 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/testdir/test_clientserver.vim b/src/testdir/test_clientserver.vim index 86dad54d7..0f403711d 100644 --- 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 3c7c967a5..eb254043b 100644 --- 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, |