summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2021-07-08 22:20:50 +0200
committerBram Moolenaar <Bram@vim.org>2021-07-08 22:20:50 +0200
commit981217c11f92b37f2baa51492cbe12e85d0ea493 (patch)
tree88f0df80409f673cfa787e5ecc4373a0f175c279
parentb885a7c72c8fed5f14454633fb3ba9d77fff1c24 (diff)
patch 8.2.3131: MS-Windows: ipv6 channel test is very flaky in the GUIv8.2.3131
Problem: MS-Windows: ipv6 channel test is very flaky in the GUI. Solution: Skip the test.
-rw-r--r--src/testdir/test_channel.vim6
-rw-r--r--src/version.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/src/testdir/test_channel.vim b/src/testdir/test_channel.vim
index 37dfd25861..f88cba004f 100644
--- a/src/testdir/test_channel.vim
+++ b/src/testdir/test_channel.vim
@@ -252,6 +252,12 @@ endfunc
func Test_communicate_ipv6()
CheckIPv6
+
+ " FIXME: this test is very flaky on MS-Windows with the GUI
+ if has('gui_running') && has('win32')
+ throw 'Skipped: test is very flaky with MS-Windows in GUI'
+ endif
+
call Test_communicate()
endfunc
diff --git a/src/version.c b/src/version.c
index fb76c39c6f..30db741edb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -756,6 +756,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 3131,
+/**/
3130,
/**/
3129,