From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 1 Feb 2017 17:00:13 +0000 (+0100)
Subject: patch 8.0.0284: collapse buffers test failed once
X-Git-Tag: v8.0.0284
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b245559fa9b03bfb0d0f77023120e60d870f0b56;p=thirdparty%2Fvim.git

patch 8.0.0284: collapse buffers test failed once

Problem:    The Test_collapse_buffers() test failed once, looks like it is
            flaky.
Solution:   Add it to the list of flaky tests.
---

diff --git a/src/testdir/runtest.vim b/src/testdir/runtest.vim
index c7028d2a66..c2260c7b7f 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -153,12 +153,13 @@ endif
 
 " Names of flaky tests.
 let s:flaky = [
-      \ 'Test_reltime()',
-      \ 'Test_nb_basic()',
-      \ 'Test_communicate()',
       \ 'Test_close_and_exit_cb()',
+      \ 'Test_collapse_buffers()',
+      \ 'Test_communicate()',
+      \ 'Test_nb_basic()',
       \ 'Test_pipe_through_sort_all()',
       \ 'Test_pipe_through_sort_some()'
+      \ 'Test_reltime()',
       \ ]
 
 " Locate Test_ functions and execute them.
diff --git a/src/version.c b/src/version.c
index ef5ddaee2f..6b0953fdf7 100644
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    284,
 /**/
     283,
 /**/