# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1485969303 -3600
# Node ID 214417c527b571fb8845cd8769e5f51246adc185
# Parent  81362af031393a6bdf0939ff564c0cc5b918a8e3
patch 8.0.0284: collapse buffers test failed once

commit https://github.com/vim/vim/commit/b245559fa9b03bfb0d0f77023120e60d870f0b56
Author: Bram Moolenaar <Bram@vim.org>
Date:   Wed Feb 1 18:00:13 2017 +0100

    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
--- 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_close_and_exit_cb()',
+      \ 'Test_collapse_buffers()',
+      \ 'Test_communicate()',
       \ 'Test_nb_basic()',
-      \ 'Test_communicate()',
-      \ 'Test_close_and_exit_cb()',
       \ '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
--- a/src/version.c
+++ b/src/version.c
@@ -765,6 +765,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    284,
+/**/
     283,
 /**/
     282,