# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1509030905 -7200
# Node ID 47f253caa805af6c226e77b45cea0cdbae4d6793
# Parent  ebdb4ea1386e73f277e269704326cb7f8b5f8d78
patch 8.0.1219: terminal test is flaky

commit https://github.com/vim/vim/commit/f204e05ae9f6bc5d922d14d457e16b590efbf3e5
Author: Bram Moolenaar <Bram@vim.org>
Date:   Thu Oct 26 17:14:01 2017 +0200

    patch 8.0.1219: terminal test is flaky

    Problem:    Terminal test is flaky.
    Solution:   Add test function to 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
@@ -109,14 +109,21 @@ func RunTheTest(test)
 
   call add(s:messages, 'Executing ' . a:test)
   let s:done += 1
-  try
+
+  if a:test =~ 'Test_nocatch_'
+    " Function handles errors itself.  This avoids skipping commands after the
+    " error.
     exe 'call ' . a:test
-  catch /^\cskipped/
-    call add(s:messages, '    Skipped')
-    call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '',  ''))
-  catch
-    call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
-  endtry
+  else
+    try
+      exe 'call ' . a:test
+    catch /^\cskipped/
+      call add(s:messages, '    Skipped')
+      call add(s:skipped, 'SKIPPED ' . a:test . ': ' . substitute(v:exception, '^\S*\s\+', '',  ''))
+    catch
+      call add(v:errors, 'Caught exception in ' . a:test . ': ' . v:exception . ' @ ' . v:throwpoint)
+    endtry
+  endif
 
   if exists("*TearDown")
     try
@@ -233,6 +240,7 @@ let s:flaky = [
       \ 'Test_quoteplus()',
       \ 'Test_quotestar()',
       \ 'Test_reltime()',
+      \ 'Test_terminal_composing_unicode()',
       \ 'Test_terminal_noblock()',
       \ 'Test_with_partial_callback()',
       \ ]
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -762,6 +762,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1219,
+/**/
     1218,
 /**/
     1217,