# HG changeset patch # User Bram Moolenaar # Date 1589383803 -7200 # Node ID 8bbb8f0b6f9c6ee5dde45151678ee08421f992a9 # Parent 953f2c775c0741015a304ba25d01e02ad057f79b patch 8.2.0750: netbeans test is a bit flaky Commit: https://github.com/vim/vim/commit/37d1b4f9416973abe9f5a7c6b81540ca88fa8489 Author: Bram Moolenaar Date: Wed May 13 17:16:04 2020 +0200 patch 8.2.0750: netbeans test is a bit flaky Problem: Netbeans test is a bit flaky. Solution: Allow for standard sign to be defined. Use WaitForAssert(). diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim --- a/src/testdir/test_netbeans.vim +++ b/src/testdir/test_netbeans.vim @@ -339,8 +339,8 @@ func Nb_basic(port) 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()) + call assert_equal({'name': '1', 'texthl': 'NB_s1', 'text': '=>'}, + \ sign_getdefined()[0]) let g:last += 3 " defineAnnoType with a long color name @@ -610,10 +610,9 @@ func Nb_basic(port) " 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]) + call WaitForAssert({-> assert_equal('0:disconnect=91', readfile("Xnetbeans")[-1])}) - " close the connection + " the connection was closed call assert_false(has("netbeans_enabled")) call delete("Xnetbeans") diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -747,6 +747,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 750, +/**/ 749, /**/ 748,