From 40d6a95670d26aadef3451d32103e6d74a1a006b Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 4 Feb 2018 16:02:35 +0800
Subject: vim-patch:8.0.0470: not enough testing for help commands

Problem:    Not enough testing for help commands.
Solution:   Add a few more help tests. (Dominique Pelle, closes vim/vim#1565)

https://github.com/vim/vim/commit/751ba616d1c47de2c273b269df06c36a7ed141a2
---
 src/nvim/testdir/test_help_tagjump.vim | 56 ++++++++++++++++++++++++++++++++++
 1 file changed, 56 insertions(+)

(limited to 'src')

diff --git a/src/nvim/testdir/test_help_tagjump.vim b/src/nvim/testdir/test_help_tagjump.vim
index 65d99c644c..b9e056b291 100644
--- a/src/nvim/testdir/test_help_tagjump.vim
+++ b/src/nvim/testdir/test_help_tagjump.vim
@@ -18,6 +18,52 @@ func Test_help_tagjump()
   call assert_true(getline('.') =~ '\*help.txt\*')
   helpclose
 
+  help |
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*bar\*')
+  helpclose
+
+  help "*
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*quotestar\*')
+  helpclose
+
+  help sm?le
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*:smile\*')
+  helpclose
+
+  help :?
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*:?\*')
+  helpclose
+
+  help FileW*Post
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*FileWritePost\*')
+  helpclose
+
+  help `ls`
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*:ls\*')
+  helpclose
+
+  help ^X
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*CTRL-X\*')
+  helpclose
+
+  help i_^_CTRL-D
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*i_^_CTRL-D\*')
+  helpclose
+
+  exec "help \<C-V>"
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*CTRL-V\*')
+  helpclose
+
+
   exec "help! ('textwidth'"
   call assert_equal("help", &filetype)
   call assert_true(getline('.') =~ "\\*'textwidth'\\*")
@@ -47,6 +93,16 @@ func Test_help_tagjump()
   call assert_equal("help", &filetype)
   call assert_true(getline('.') =~ '\*{address}\*')
   helpclose
+
+  exusage
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*:index\*')
+  helpclose
+
+  viusage
+  call assert_equal("help", &filetype)
+  call assert_true(getline('.') =~ '\*normal-index\*')
+  helpclose
 endfunc
 
 let s:langs = ['en', 'ab', 'ja']
-- 
cgit 


From ab35caf9cf680d0432c8eebdf2222441545af31b Mon Sep 17 00:00:00 2001
From: ckelsel <ckelsel@hotmail.com>
Date: Sun, 4 Feb 2018 16:08:13 +0800
Subject: vim-patch:8.0.0471: exit callback test sometimes fails

Problem:    Exit callback test sometimes fails.
Solution:   Add it to the list of flaky tests.

https://github.com/vim/vim/commit/0529b3eb01fcfd18c0644f8ece9ea107dd460a0f
---
 src/nvim/testdir/runtest.vim | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src')

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 4de1345679..a0e8cfeb99 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -197,6 +197,7 @@ endif
 
 " Names of flaky tests.
 let s:flaky = [
+      \ 'Test_exit_callback_interval()',
       \ 'Test_with_partial_callback()',
       \ 'Test_oneshot()',
       \ 'Test_lambda_with_timer()',
-- 
cgit 


From 5f5caa367a9c4fd977e72f322a24e327f191416a Mon Sep 17 00:00:00 2001
From: KunMing Xie <qqzz014@gmail.com>
Date: Tue, 6 Feb 2018 09:09:59 +0800
Subject: use split instead of smile for neovim

---
 src/nvim/testdir/test_help_tagjump.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/nvim/testdir/test_help_tagjump.vim b/src/nvim/testdir/test_help_tagjump.vim
index b9e056b291..06c48d8e76 100644
--- a/src/nvim/testdir/test_help_tagjump.vim
+++ b/src/nvim/testdir/test_help_tagjump.vim
@@ -28,9 +28,9 @@ func Test_help_tagjump()
   call assert_true(getline('.') =~ '\*quotestar\*')
   helpclose
 
-  help sm?le
+  help sp?it
   call assert_equal("help", &filetype)
-  call assert_true(getline('.') =~ '\*:smile\*')
+  call assert_true(getline('.') =~ '\*:split\*')
   helpclose
 
   help :?
-- 
cgit