diff options
| author | Bram Moolenaar <Bram@vim.org> | 2020-05-13 17:16:04 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2020-05-13 17:16:04 +0200 |
| commit | 37d1b4f9416973abe9f5a7c6b81540ca88fa8489 (patch) | |
| tree | 71fec77ec4d34e27522df67edfc8d3950ce6000b | |
| parent | 55ba4b844f1b0e44f0f2e1bd14d26e7ad2df9ffc (diff) | |
| download | vim-git-37d1b4f9416973abe9f5a7c6b81540ca88fa8489.tar.gz | |
patch 8.2.0750: netbeans test is a bit flakyv8.2.0750
Problem: Netbeans test is a bit flaky.
Solution: Allow for standard sign to be defined. Use WaitForAssert().
| -rw-r--r-- | src/testdir/test_netbeans.vim | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim index a0606fcf0..7f1dab46d 100644 --- 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 index dae935717..e78145ea7 100644 --- 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, |