diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-06-10 16:30:32 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-06-10 16:30:32 +0200 |
| commit | 1c13c0fe3e7b15750464ffbc39a4648aa5c639be (patch) | |
| tree | f12db144aa524b2bf461a2a50eec5c90de66b1cc | |
| parent | fa4161cb0c266378012d3fde0eca56da8739528d (diff) | |
patch 8.0.0632: the quotestar test is still a bit flakyv8.0.0632
Problem: The quotestar test is still a bit flaky.
Solution: Kill any existing server to make the retry work. Wait for the
register to be filled.
| -rw-r--r-- | src/testdir/test_quotestar.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/testdir/test_quotestar.vim b/src/testdir/test_quotestar.vim index 37e3a10ed1..b053260be3 100644 --- a/src/testdir/test_quotestar.vim +++ b/src/testdir/test_quotestar.vim @@ -50,6 +50,15 @@ func Do_test_quotestar_for_x11() endtry let name = 'XVIMCLIPBOARD' + + " Make sure a previous server has exited + try + call remote_send(name, ":qa!\<CR>") + call WaitFor('serverlist() !~ "' . name . '"') + catch /E241:/ + endtry + call assert_notmatch(name, serverlist()) + let cmd .= ' --servername ' . name let g:job = job_start(cmd, {'stoponexit': 'kill', 'out_io': 'null'}) call WaitFor('job_status(g:job) == "run"') @@ -76,6 +85,7 @@ func Do_test_quotestar_for_x11() call assert_equal('yes', remote_expr(name, "@*", "", 2)) " Check that the *-register of this vim instance is changed as expected. + call WaitFor('@* == "yes"') call assert_equal('yes', @*) if has('unix') && has('gui') && !has('gui_running') diff --git a/src/version.c b/src/version.c index 8f59546bea..3c7c967a5d 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 */ /**/ + 632, +/**/ 631, /**/ 630, |