summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-08-12 23:56:20 +0200
committerBram Moolenaar <Bram@vim.org>2019-08-12 23:56:20 +0200
commit9570aacdb82c1eb5645d0fbc35bf9728d7334b23 (patch)
treefc9cf1d510fe17e8f9da1d9be202672fefb65c62
parentd5e3cc11d391f3aa80bf66f91001f11a3a145b43 (diff)
patch 8.1.1842: test listed as flaky should no longer be flakyv8.1.1842
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)
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/version.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index c606cacd2d..9b41b46f10 100644
--- 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 5e40a1fa4f..568852bbd2 100644
--- 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,