To: vim_dev@googlegroups.com Subject: Patch 8.0.1365 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.0.1365 Problem: When one channel test fails others fail as well. Solution: Stop the job after a failure. Also add a couple of tests to the list of flaky tests. Files: src/testdir/test_channel.vim, src/testdir/runtest.vim *** ../vim-8.0.1364/src/testdir/test_channel.vim 2017-11-04 19:24:24.754197129 +0100 --- src/testdir/test_channel.vim 2017-11-29 23:17:48.371980779 +0100 *************** *** 1694,1712 **** let g:envstr = '' if has('win32') let expect = $TEMP ! call job_start(['cmd', '/c', 'echo %CD%'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect}) else let expect = $HOME ! call job_start(['pwd'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect}) endif ! call WaitFor('"" != g:envstr') ! let expect = substitute(expect, '[/\\]$', '', '') ! let g:envstr = substitute(g:envstr, '[/\\]$', '', '') ! if $CI != '' && stridx(g:envstr, '/private/') == 0 ! let g:envstr = g:envstr[8:] ! endif ! call assert_equal(expect, g:envstr) ! unlet g:envstr endfunc function Ch_test_close_lambda(port) --- 1694,1716 ---- let g:envstr = '' if has('win32') let expect = $TEMP ! let job = job_start(['cmd', '/c', 'echo %CD%'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect}) else let expect = $HOME ! let job = job_start(['pwd'], {'callback': {ch,msg->execute(":let g:envstr .= msg")}, 'cwd': expect}) endif ! try ! call WaitFor('"" != g:envstr') ! let expect = substitute(expect, '[/\\]$', '', '') ! let g:envstr = substitute(g:envstr, '[/\\]$', '', '') ! if $CI != '' && stridx(g:envstr, '/private/') == 0 ! let g:envstr = g:envstr[8:] ! endif ! call assert_equal(expect, g:envstr) ! finally ! call job_stop(job) ! unlet g:envstr ! endtry endfunc function Ch_test_close_lambda(port) *************** *** 1731,1737 **** func s:test_list_args(cmd, out, remove_lf) try let g:out = '' ! call job_start([s:python, '-c', a:cmd], {'callback': {ch, msg -> execute('let g:out .= msg')}, 'out_mode': 'raw'}) call WaitFor('"" != g:out') if has('win32') let g:out = substitute(g:out, '\r', '', 'g') --- 1735,1741 ---- func s:test_list_args(cmd, out, remove_lf) try let g:out = '' ! let job = job_start([s:python, '-c', a:cmd], {'callback': {ch, msg -> execute('let g:out .= msg')}, 'out_mode': 'raw'}) call WaitFor('"" != g:out') if has('win32') let g:out = substitute(g:out, '\r', '', 'g') *************** *** 1741,1746 **** --- 1745,1751 ---- endif call assert_equal(a:out, g:out) finally + call job_stop(job) unlet g:out endtry endfunc *** ../vim-8.0.1364/src/testdir/runtest.vim 2017-11-21 15:14:46.486930852 +0100 --- src/testdir/runtest.vim 2017-12-02 16:34:16.196188270 +0100 *************** *** 251,256 **** --- 251,257 ---- \ 'Test_exit_callback_interval()', \ 'Test_nb_basic()', \ 'Test_oneshot()', + \ 'Test_paused()', \ 'Test_pipe_through_sort_all()', \ 'Test_pipe_through_sort_some()', \ 'Test_quoteplus()', *************** *** 259,264 **** --- 260,266 ---- \ 'Test_terminal_composing_unicode()', \ 'Test_terminal_noblock()', \ 'Test_terminal_redir_file()', + \ 'Test_terminal_tmap()', \ 'Test_with_partial_callback()', \ ] *** ../vim-8.0.1364/src/version.c 2017-12-02 15:43:28.498450632 +0100 --- src/version.c 2017-12-02 16:34:56.231958191 +0100 *************** *** 773,774 **** --- 773,776 ---- { /* Add new patch number below this line */ + /**/ + 1365, /**/ -- hundred-and-one symptoms of being an internet addict: 63. You start using smileys in your snail mail. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///