# HG changeset patch
# User Bram Moolenaar <Bram@vim.org>
# Date 1565647205 -7200
# Node ID cd8d071bbe70442af9bdb8686eab7d86534592ea
# Parent  15b71dff4c2de8cd58dc34279c398caf26ade846
patch 8.1.1842: test listed as flaky should no longer be flaky

commit https://github.com/vim/vim/commit/9570aacdb82c1eb5645d0fbc35bf9728d7334b23
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Aug 12 23:56:20 2019 +0200

    patch 8.1.1842: test listed as flaky should no longer be flaky

    Problem:    Test listed as flaky should no longer be flaky.
    Solution:   Remove Test_popup_and_window_resize from the list of flaky tests.
                (Daniel Hahler, close #4807)

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -329,7 +329,6 @@ let s:flaky_tests = [
       \ 'Test_paused()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()',
-      \ 'Test_popup_and_window_resize()',
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
       \ 'Test_raw_one_time_callback()',
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1842,
+/**/
     1841,
 /**/
     1840,