# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1592847004 -7200
# Node ID 736d6e6f55f6d0962212c4d2db663d33a5671c41
# Parent  23e89ca0b70f46386480725fb31d621ce1dfed86
patch 8.2.1036: popupwin test fails sometimes

Commit: https://github.com/vim/vim/commit/373c65104e0991724cb57910dfb3e5c276e2d7e7
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Jun 22 19:24:23 2020 +0200

    patch 8.2.1036: popupwin test fails sometimes

    Problem:    Popupwin test fails sometimes.
    Solution:   Use WaitForAssert() instead of a sleep.

diff --git a/src/testdir/test_popupwin.vim b/src/testdir/test_popupwin.vim
--- 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
--- a/src/version.c
+++ b/src/version.c
@@ -755,6 +755,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1036,
+/**/
     1035,
 /**/
     1034,