summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-16 21:13:35 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-16 21:13:35 +0200
commit4e03933726e3698d962bf7dacdd27f306a4c5086 (patch)
tree5d3fc435cdba1dbbb207124074b423e8bd7fdbc1
parent4bd88d568a81d37df69dc3cf8cdd8d9dbb4011b7 (diff)
patch 8.1.2162: popup resize test is flakyv8.1.2162
Problem: Popup resize test is flaky. (Christian Brabandt) Solution: Add the function to the list of flaky tests.
-rw-r--r--src/testdir/runtest.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index a8eb5e23b0..e22557d5a2 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -340,6 +340,7 @@ let s:flaky_tests = [
\ 'Test_quotestar()',
\ 'Test_raw_one_time_callback()',
\ 'Test_reltime()',
+ \ 'Test_popup_and_window_resize()',
\ 'Test_server_crash()',
\ 'Test_state()',
\ 'Test_term_mouse_double_click_to_create_tab()',
diff --git a/src/version.c b/src/version.c
index f84340d3cb..347e0d5844 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 */
/**/
+ 2162,
+/**/
2161,
/**/
2160,