diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-21 18:02:41 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-21 18:02:41 +0100 |
| commit | 4889ad7c6cd46368f553cc1140ca17508e8beaaa (patch) | |
| tree | 1f56aedff57d4f7ee7ce81a85f49179286047d82 | |
| parent | c6aafbaf3ea755e3ab4ee2e3045911126a08b038 (diff) | |
| download | vim-git-4889ad7c6cd46368f553cc1140ca17508e8beaaa.tar.gz | |
patch 8.0.0500: quotestar test is still a bit flakyv8.0.0500
Problem: Quotestar test is still a bit flaky.
Solution: Add a slower check for v:version.
| -rw-r--r-- | src/testdir/test_quotestar.vim | 8 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim index 5212b9bc6..d0dd04f91 100644 --- a/src/testdir/test_quotestar.vim +++ b/src/testdir/test_quotestar.vim @@ -53,6 +53,10 @@ func Do_test_quotestar_for_x11() call WaitFor('serverlist() =~ "' . name . '"') call assert_match(name, serverlist()) + " Wait for the server to be up and answering requests. One second is not + " always sufficient. + call WaitFor('remote_expr("' . name . '", "v:version", "", 2) != ""') + " Clear the *-register of this vim instance. let @* = '' @@ -78,8 +82,8 @@ func Do_test_quotestar_for_x11() else call remote_send(name, ":gui -f\<CR>") endif - " Wait for the server to be up and answering requests. - call WaitFor('remote_expr("' . name . '", "v:version", "", 1) != ""') + " Wait for the server in the GUI to be up and answering requests. + call WaitFor('remote_expr("' . name . '", "has(\"gui_running\")", "", 1) =~ "1"') call remote_send(name, ":let @* = 'maybe'\<CR>") call WaitFor('remote_expr("' . name . '", "@*", "", 1) == "maybe"') diff --git a/src/version.c b/src/version.c index 3b651ccae..c3a4779d7 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 */ /**/ + 500, +/**/ 499, /**/ 498, |