diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-09-03 18:47:24 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-09-03 18:47:24 +0200 |
| commit | f7f3e32fcc4984d87f26337316379c2e2d90f7f1 (patch) | |
| tree | 2795b129d601d4fb9eb30567b1af2bd1981a601e | |
| parent | 87bc3f74598ae8c648957e5755000cc6cdbc89ce (diff) | |
patch 7.4.2316v7.4.2316
Problem: Channel sort test is flaky.
Solution: Add a check the output has been read.
| -rw-r--r-- | src/testdir/test_channel.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 251de600c7..4b511118ad 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -831,6 +831,7 @@ func Run_pipe_through_sort(all, use_buffer) call assert_equal("dead", job_status(g:job)) sp sortout + call WaitFor('line("$") > 3') call assert_equal('Reading from channel output...', getline(1)) if a:all call assert_equal(['aaa', 'bbb', 'ccc', 'ddd', 'eee'], getline(2, 6)) diff --git a/src/version.c b/src/version.c index 297830f053..04cf59ea87 100644 --- a/src/version.c +++ b/src/version.c @@ -764,6 +764,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2316, +/**/ 2315, /**/ 2314, |