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
index c606cacd2dd646b132fd92952fabe74392f11487..9b41b46f104e726d6cdcd0ab485e9f5d0e66905d 100644 (file)
--- 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
index 5e40a1fa4f570e711e850cbe03a03154b0b1ecda..568852bbd2c0ded515a9fb6700e49fc3ec823df5 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1842,
 /**/
     1841,
 /**/