diff options
| author | lonerover <pathfinder1644@yahoo.com> | 2018-05-20 10:30:43 +0800 |
|---|---|---|
| committer | lonerover <pathfinder1644@yahoo.com> | 2018-05-20 10:31:29 +0800 |
| commit | fd5cc7dd0a63e00200a4517d3b6d81f2f8e6863b (patch) | |
| tree | 4f56c20121ee29e4e056183354c2cfe81c8301cf /src | |
| parent | 4dd614e51ac4f2ae0c40637c81d58f731faa63b3 (diff) | |
| download | rneovim-fd5cc7dd0a63e00200a4517d3b6d81f2f8e6863b.tar.gz rneovim-fd5cc7dd0a63e00200a4517d3b6d81f2f8e6863b.tar.bz2 rneovim-fd5cc7dd0a63e00200a4517d3b6d81f2f8e6863b.zip | |
vim-patch:8.0.0500: quotestar test is still a bit flaky
Problem: Quotestar test is still a bit flaky.
Solution: Add a slower check for v:version.
https://github.com/vim/vim/commit/4889ad7c6cd46368f553cc1140ca17508e8beaaa
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/testdir/test_quotestar.vim | 8 | ||||
| -rw-r--r-- | src/nvim/version.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/src/nvim/testdir/test_quotestar.vim b/src/nvim/testdir/test_quotestar.vim index 5212b9bc62..d0dd04f91d 100644 --- a/src/nvim/testdir/test_quotestar.vim +++ b/src/nvim/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/nvim/version.c b/src/nvim/version.c index 1267759970..17f89a25d2 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -1139,7 +1139,7 @@ static const int included_patches[] = { // 503, 502, // 501, - // 500, + 500, 499, 498, // 497, |