From 373c65104e0991724cb57910dfb3e5c276e2d7e7 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 22 Jun 2020 19:24:23 +0200
Subject: [PATCH] patch 8.2.1036: popupwin test fails sometimes

Problem:    Popupwin test fails sometimes.
Solution:   Use WaitForAssert() instead of a sleep.
---
 src/testdir/test_popupwin.vim | 4 +++-
 src/version.c                 | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
index 42f4256c3e..80a14595e0 100644
--- a/src/testdir/test_popupwin.vim
+++ b/src/testdir/test_popupwin.vim
@@ -2454,9 +2454,11 @@ func Test_popupwin_terminal_buffer()
   call term_sendkeys(termbuf2, "exit\<CR>")
 
   " Exiting shell closes popup window
+  let pupwin = win_getid()
   call feedkeys("exit\<CR>", 'xt')
   " Wait for shell to exit
-  sleep 100m
+  call WaitForAssert({-> assert_notequal(pupwin, win_getid())})
+
   call feedkeys(":quit\<CR>", 'xt')
   call assert_equal(origwin, win_getid())
 endfunc
diff --git a/src/version.c b/src/version.c
index 3c6b744b56..42c03d0922 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 */
+/**/
+    1036,
 /**/
     1035,
 /**/