patch 8.2.1432: various inconsistencies in test files
Problem: Various inconsistencies in test files.
Solution: Add modelines where they were missing. Use Check commands instead
of silently skipping over tests. Adjust indents and comments.
(Ken Takata, closes #6695)
diff --git a/src/testdir/test_startup.vim b/src/testdir/test_startup.vim
index 4c8c887..567c433 100644
--- a/src/testdir/test_startup.vim
+++ b/src/testdir/test_startup.vim
@@ -21,9 +21,7 @@
" 2. packages
" 3. plugins in after directories
func Test_after_comes_later()
- if !has('packages')
- return
- endif
+ CheckFeature packages
let before =<< trim [CODE]
set nocp viminfo+=nviminfo
set guioptions+=M
@@ -80,9 +78,7 @@
endfunc
func Test_pack_in_rtp_when_plugins_run()
- if !has('packages')
- return
- endif
+ CheckFeature packages
let before =<< trim [CODE]
set nocp viminfo+=nviminfo
set guioptions+=M
@@ -113,9 +109,8 @@
endfunc
func Test_help_arg()
- if !has('unix') && has('gui')
- " this doesn't work with gvim on MS-Windows
- return
+ if !has('unix') && has('gui_running')
+ throw 'Skipped: does not work with gvim on MS-Windows'
endif
if RunVim([], [], '--help >Xtestout')
let lines = readfile('Xtestout')
@@ -554,9 +549,7 @@
endfunc
func Test_startuptime()
- if !has('startuptime')
- return
- endif
+ CheckFeature startuptime
let after = ['qall']
if RunVim([], after, '--startuptime Xtestout one')
let lines = readfile('Xtestout')