aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzeertzjq <zeertzjq@outlook.com>2023-05-20 08:21:48 +0800
committerGitHub <noreply@github.com>2023-05-20 08:21:48 +0800
commit413d57ae717d0e87ba01db7f46afaa5ae25ebe0b (patch)
tree97cfca0fba8a0a519a7cd24498a118d8a995f808
parentd86a737df1e1c56c838d8e6109107b56000be226 (diff)
downloadrneovim-413d57ae717d0e87ba01db7f46afaa5ae25ebe0b.tar.gz
rneovim-413d57ae717d0e87ba01db7f46afaa5ae25ebe0b.tar.bz2
rneovim-413d57ae717d0e87ba01db7f46afaa5ae25ebe0b.zip
vim-patch:partial:9.0.1570: some tests are slow (#23688)
Problem: Some tests are slow. Solution: Make a few test cases faster. https://github.com/vim/vim/commit/bf63011a52a3cc32609ae5945665875062a5ae50 Cherry-pick related test_cmdline.vim changes from patch 9.0.0418. Co-authored-by: Bram Moolenaar <Bram@vim.org>
-rw-r--r--test/old/testdir/test_cmdline.vim12
-rw-r--r--test/old/testdir/test_filetype.vim7
2 files changed, 9 insertions, 10 deletions
diff --git a/test/old/testdir/test_cmdline.vim b/test/old/testdir/test_cmdline.vim
index 9ed49b44c0..96a30a1dd5 100644
--- a/test/old/testdir/test_cmdline.vim
+++ b/test/old/testdir/test_cmdline.vim
@@ -719,7 +719,7 @@ endfunc
func Test_shellcmd_completion()
let save_path = $PATH
- call mkdir('Xpathdir/Xpathsubdir', 'p')
+ call mkdir('Xpathdir/Xpathsubdir', 'pR')
call writefile([''], 'Xpathdir/Xfile.exe')
call setfperm('Xpathdir/Xfile.exe', 'rwx------')
@@ -735,17 +735,15 @@ func Test_shellcmd_completion()
call insert(expected, 'Xfile.exe')
call assert_equal(expected, actual)
- call delete('Xpathdir', 'rf')
let $PATH = save_path
endfunc
func Test_expand_star_star()
- call mkdir('a/b', 'p')
- call writefile(['asdfasdf'], 'a/b/fileXname')
- call feedkeys(":find **/fileXname\<Tab>\<CR>", 'xt')
- call assert_equal('find a/b/fileXname', @:)
+ call mkdir('a/b/c', 'pR')
+ call writefile(['asdfasdf'], 'a/b/c/fileXname')
+ call feedkeys(":find a/**/fileXname\<Tab>\<CR>", 'xt')
+ call assert_equal('find a/b/c/fileXname', @:)
bwipe!
- call delete('a', 'rf')
endfunc
func Test_cmdline_paste()
diff --git a/test/old/testdir/test_filetype.vim b/test/old/testdir/test_filetype.vim
index 5d791bb0f9..2858bf1add 100644
--- a/test/old/testdir/test_filetype.vim
+++ b/test/old/testdir/test_filetype.vim
@@ -710,19 +710,20 @@ func CheckItems(checks)
for i in range(0, len(names) - 1)
new
try
- exe 'edit ' . fnameescape(names[i])
+ exe 'edit ' .. fnameescape(names[i])
catch
- call assert_report('cannot edit "' . names[i] . '": ' . v:exception)
+ call assert_report('cannot edit "' .. names[i] .. '": ' .. v:exception)
endtry
if &filetype == '' && &readonly
" File exists but not able to edit it (permission denied)
else
let expected = ft == 'none' ? '' : ft
- call assert_equal(expected, &filetype, 'with file name: ' . names[i])
+ call assert_equal(expected, &filetype, 'with file name: ' .. names[i])
endif
bwipe!
endfor
endfor
+
set swapfile&
endfunc