diff options
author | Bram Moolenaar <Bram@vim.org> | 2019-01-05 00:35:22 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2019-01-05 00:35:22 +0100 |
commit | f780b8a1c1aefb0c4b4866e50080594e3f7f16cb (patch) | |
tree | 2eea06870dccef7184e2108e23c9ecdad33551aa /src | |
parent | 8b62d87e4243d3dc9bf4f17bfe1a8953077a70c9 (diff) |
patch 8.1.0693: channel test fails sometimesv8.1.0693
Problem: Channel test fails sometimes.
Solution: Avoid race condition.
Diffstat (limited to 'src')
-rw-r--r-- | src/testdir/test_channel.vim | 7 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 091cd4ba12..f5ee7c086c 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -1650,17 +1650,16 @@ func Test_write_to_deleted_buffer() return endif let job = job_start('echo hello', {'out_io': 'buffer', 'out_name': 'test_buffer', 'out_msg': 0}) - call WaitForAssert({-> assert_equal("dead", job_status(job))}) let bufnr = bufnr('test_buffer') - call assert_equal(['hello'], getbufline(bufnr, 1, '$')) + call WaitForAssert({-> assert_equal(['hello'], getbufline(bufnr, 1, '$'))}) call assert_equal('nofile', getbufvar(bufnr, '&buftype')) call assert_equal('hide', getbufvar(bufnr, '&bufhidden')) + bdel test_buffer call assert_equal([], getbufline(bufnr, 1, '$')) let job = job_start('echo hello', {'out_io': 'buffer', 'out_name': 'test_buffer', 'out_msg': 0}) - call WaitForAssert({-> assert_equal("dead", job_status(job))}) - call assert_equal(['hello'], getbufline(bufnr, 1, '$')) + call WaitForAssert({-> assert_equal(['hello'], getbufline(bufnr, 1, '$'))}) call assert_equal('nofile', getbufvar(bufnr, '&buftype')) call assert_equal('hide', getbufvar(bufnr, '&bufhidden')) diff --git a/src/version.c b/src/version.c index 193e3270aa..7d3a5f619b 100644 --- a/src/version.c +++ b/src/version.c @@ -800,6 +800,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 693, +/**/ 692, /**/ 691, |