patch 8.1.0693: channel test fails sometimes

Problem:    Channel test fails sometimes.
Solution:   Avoid race condition.

diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 091cd4ba123cd737489c86c18462f066cce34a3c..f5ee7c086c658730ea1431567dc81565025c752c 100644 (file)
--- 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 193e3270aa5b0fb8f447a77b36a755cddd1b2138..7d3a5f619bb77eb6a2aba0fe1e5e10eda36dd411 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -799,6 +799,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    693,
 /**/
     692,
 /**/