summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2020-11-03 11:53:29 +0100
committerBram Moolenaar <Bram@vim.org>2020-11-03 11:53:29 +0100
commit6fd3a4ba2320c4a95f02daef5f2ac76d3105d013 (patch)
treed8e9ba62f1c39a68bf7031ca96fea185717eb847
parent36113e46b4a7e8c33aa1ed1c9cfa6591c952183d (diff)
downloadvim-git-6fd3a4ba2320c4a95f02daef5f2ac76d3105d013.tar.gz
patch 8.2.1944: Netbeans test is flakyv8.2.1944
Problem: Netbeans test is flaky. Solution: Add a short delay. (Yegappan Lakshmanan, closes #7246)
-rw-r--r--src/testdir/test_netbeans.vim2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/testdir/test_netbeans.vim b/src/testdir/test_netbeans.vim
index c4851ae1a..629c31af9 100644
--- a/src/testdir/test_netbeans.vim
+++ b/src/testdir/test_netbeans.vim
@@ -309,6 +309,7 @@ func Nb_basic(port)
call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
let l = ReadXnetbeans()
call assert_equal('send: 2:setDot!57 3/6', l[-1])
+ sleep 10m
call assert_equal([0, 3, 7, 0], getpos('.'))
let g:last += 3
@@ -318,6 +319,7 @@ func Nb_basic(port)
call WaitFor('len(ReadXnetbeans()) >= (g:last + 3)')
let l = ReadXnetbeans()
call assert_equal('send: 2:setDot!57 9', l[-1])
+ sleep 10m
call assert_equal([0, 2, 1, 0], getpos('.'))
let g:last += 3
diff --git a/src/version.c b/src/version.c
index b1125670c..714d038f8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1944,
+/**/
1943,
/**/
1942,