summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-12-05 14:04:27 +0100
committerBram Moolenaar <Bram@vim.org>2017-12-05 14:04:27 +0100
commit1eca6f13d62d2201f3bf0e83400c2e3de7df3951 (patch)
treed11632d31f9adf499b220c7241f16cbda4088f23
parent92467d3351853de769329f62121bf34d28647546 (diff)
patch 8.0.1370: channel test for callback is flakyv8.0.1370
Problem: Channel test for callback is flaky. Solution: Add the test to thelist 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 8a4a9b7a07..608fca4660 100644
--- a/src/testdir/runtest.vim
+++ b/src/testdir/runtest.vim
@@ -251,6 +251,7 @@ let s:flaky = [
\ 'Test_exit_callback_interval()',
\ 'Test_nb_basic()',
\ 'Test_oneshot()',
+ \ 'Test_out_cb()',
\ 'Test_paused()',
\ 'Test_pipe_through_sort_all()',
\ 'Test_pipe_through_sort_some()',
diff --git a/src/version.c b/src/version.c
index 892882f330..d7f22b062e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -772,6 +772,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1370,
+/**/
1369,
/**/
1368,