To: vim_dev@googlegroups.com Subject: Patch 8.2.0750 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.0750 Problem: Netbeans test is a bit flaky. Solution: Allow for standard sign to be defined. Use WaitForAssert(). Files: src/testdir/test_netbeans.vim *** ../vim-8.2.0749/src/testdir/test_netbeans.vim 2020-04-19 14:02:22.427687032 +0200 --- src/testdir/test_netbeans.vim 2020-05-13 17:13:53.598631385 +0200 *************** *** 339,346 **** let l = readfile('Xnetbeans') call assert_equal('send: 2:defineAnnoType!60 1 "s1" "x" "=>" blue none', l[-1]) sleep 1m ! call assert_equal([{'name': '1', 'texthl': 'NB_s1', 'text': '=>'}], ! \ sign_getdefined()) let g:last += 3 " defineAnnoType with a long color name --- 339,346 ---- let l = readfile('Xnetbeans') call assert_equal('send: 2:defineAnnoType!60 1 "s1" "x" "=>" blue none', l[-1]) sleep 1m ! call assert_equal({'name': '1', 'texthl': 'NB_s1', 'text': '=>'}, ! \ sign_getdefined()[0]) let g:last += 3 " defineAnnoType with a long color name *************** *** 610,619 **** " detach call appendbufline(cmdbufnr, '$', 'detach_Test') call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 6)') ! let l = readfile('Xnetbeans') ! call assert_equal('0:disconnect=91', l[-1]) ! " close the connection call assert_false(has("netbeans_enabled")) call delete("Xnetbeans") --- 610,618 ---- " detach call appendbufline(cmdbufnr, '$', 'detach_Test') call WaitFor('len(readfile("Xnetbeans")) >= (g:last + 6)') ! call WaitForAssert({-> assert_equal('0:disconnect=91', readfile("Xnetbeans")[-1])}) ! " the connection was closed call assert_false(has("netbeans_enabled")) call delete("Xnetbeans") *** ../vim-8.2.0749/src/version.c 2020-05-13 16:53:43.514247289 +0200 --- src/version.c 2020-05-13 17:14:54.890440007 +0200 *************** *** 748,749 **** --- 748,751 ---- { /* Add new patch number below this line */ + /**/ + 750, /**/ -- I AM THANKFUL... ...for a lawn that needs mowing, windows that need cleaning and gutters that need fixing because it means I have a home. /// 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 ///