diff options
| author | Bram Moolenaar <Bram@vim.org> | 2018-12-14 22:42:13 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2018-12-14 22:42:13 +0100 |
| commit | 6c8dd39df938c7502a740f59825feeaa5736b245 (patch) | |
| tree | 0afeb214ac35fc77e19c1c25d44cba6051b380ec | |
| parent | cd1a62d468a55aca68deb3139d83530c7c23568d (diff) | |
| download | vim-git-8.1.0591.tar.gz | |
patch 8.1.0591: channel sort test is flakyv8.1.0591
Problem: Channel sort test is flaky.
Solution: Do not check if the job is running, it may have be done very fast.
| -rw-r--r-- | src/testdir/test_channel.vim | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim index 072bbe028..bbc604853 100644 --- a/src/testdir/test_channel.vim +++ b/src/testdir/test_channel.vim @@ -922,9 +922,9 @@ func Run_pipe_through_sort(all, use_buffer) let options.in_bot = 4 endif let g:job = job_start('sort', options) - call assert_equal("run", job_status(g:job)) if !a:use_buffer + call assert_equal("run", job_status(g:job)) call ch_sendraw(g:job, "ccc\naaa\nddd\nbbb\neee\n") call ch_close_in(g:job) endif diff --git a/src/version.c b/src/version.c index 3ea9dc691..aafd4cba2 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 */ /**/ + 591, +/**/ 590, /**/ 589, |