From 17f67547f36a06220ea4667aaee7bb130108f568 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 20 Aug 2020 18:29:13 +0200
Subject: [PATCH] patch 8.2.1497: CursorHold test is flaky
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Problem:    CursorHold test is flaky. (Jakub Kądziołka)
Solution:   Use WaitForAssert() (closes #6754)
---
 src/testdir/test_autocmd.vim | 11 +++++------
 src/version.c                |  2 ++
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/testdir/test_autocmd.vim b/src/testdir/test_autocmd.vim
index ca8cc04c2..73674a288 100644
--- a/src/testdir/test_autocmd.vim
+++ b/src/testdir/test_autocmd.vim
@@ -29,20 +29,19 @@ func Test_CursorHold_autocmd()
   END
   call writefile(before, 'Xinit')
   let buf = RunVimInTerminal('-S Xinit Xfile', {})
-  call term_wait(buf)
+  call term_sendkeys(buf, "G")
+  call term_wait(buf, 20)
   call term_sendkeys(buf, "gg")
   call term_wait(buf)
-  sleep 50m
+  call WaitForAssert({-> assert_equal(['1'], readfile('Xoutput')[-1:-1])})
   call term_sendkeys(buf, "j")
   call term_wait(buf)
-  sleep 50m
+  call WaitForAssert({-> assert_equal(['1', '2'], readfile('Xoutput')[-2:-1])})
   call term_sendkeys(buf, "j")
   call term_wait(buf)
-  sleep 50m
+  call WaitForAssert({-> assert_equal(['1', '2', '3'], readfile('Xoutput')[-3:-1])})
   call StopVimInTerminal(buf)
 
-  call assert_equal(['1', '2', '3'], readfile('Xoutput')[-3:-1])
-
   call delete('Xinit')
   call delete('Xoutput')
   call delete('Xfile')
diff --git a/src/version.c b/src/version.c
index c2057b318..28400fbff 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1497,
 /**/
     1496,
 /**/