changeset 20390:8bbb8f0b6f9c v8.2.0750

patch 8.2.0750: netbeans test is a bit flaky Commit: https://github.com/vim/vim/commit/37d1b4f9416973abe9f5a7c6b81540ca88fa8489 Author: Bram Moolenaar <Bram@vim.org> 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().
author Bram Moolenaar <Bram@vim.org>
date Wed, 13 May 2020 17:30:03 +0200
parents 953f2c775c07
children 9ceee4daa596
files src/testdir/test_netbeans.vim src/version.c
diffstat 2 files changed, 6 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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")
--- 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,