summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-10-15 17:09:50 +0100
committerBram Moolenaar <Bram@vim.org>2021-10-15 17:09:50 +0100
commiteaa006dae3d5730e3b6dead27905444998b2cf8e (patch)
tree17e708213842570d1f33fa75d9de5bed9e7948b4 /src
parenta2cff1dbc9c58758977eba3034603e6fe459031b (diff)
downloadvim-git-eaa006dae3d5730e3b6dead27905444998b2cf8e.tar.gz
patch 8.2.3514: autoread test with nano second time sometimes failsv8.2.3514
Problem: Autoread test with nano second time sometimes fails. Solution: Mark the test as being flaky.
Diffstat (limited to 'src')
-rw-r--r--src/testdir/test_stat.vim8
-rw-r--r--src/version.c2
2 files changed, 7 insertions, 3 deletions
diff --git a/src/testdir/test_stat.vim b/src/testdir/test_stat.vim
index 38ced6d37..fa61c5c06 100644
--- a/src/testdir/test_stat.vim
+++ b/src/testdir/test_stat.vim
@@ -97,16 +97,18 @@ endfunc
func Test_autoread_fast()
CheckFeature nanotime
+ " this is timing sensitive
+ let g:test_is_flaky = 1
+
new Xautoread
- set autoread
+ setlocal autoread
call setline(1, 'foo')
-
w!
silent !echo bar > Xautoread
sleep 10m
checktime
-
call assert_equal('bar', trim(getline(1)))
+
call delete('Xautoread')
endfunc
diff --git a/src/version.c b/src/version.c
index d6b4c8831..f7ebc702b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -758,6 +758,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3514,
+/**/
3513,
/**/
3512,