Skip to content

tests: Remove MacVim-specific flaky tests guard #1614

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

tests: Remove MacVim-specific flaky tests guard #1614

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 1 addition & 19 deletions src/testdir/runtest.vim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,15 +457,6 @@ endfunc

func AfterTheTest(func_name)
if len(v:errors) > 0
if has('gui_macvim') && g:test_is_flaky
" MacVim's currently doesn't always pass these tests. Make these
" tests pending for now before a more proper fix is implemented.
call add(s:messages, 'MacVim marked ' .. a:func_name .. 'as pending')
let s:pending += 1
call add(s:errors_pending, 'Found errors in ' . g:testfunc . ':')
call extend(s:errors_pending, v:errors)
call add(s:errors_pending, 'PENDING ' .. a:func_name)
else
if match(s:may_fail_list, '^' .. a:func_name) >= 0
let s:fail_expected += 1
call add(s:errors_expected, 'Found errors in ' . g:testfunc . ':')
Expand All @@ -475,7 +466,6 @@ func AfterTheTest(func_name)
call add(s:errors, 'Found errors in ' . g:testfunc . ':')
call extend(s:errors, v:errors)
endif
endif
let v:errors = []
endif
endfunc
Expand All @@ -498,7 +488,7 @@ func FinishTesting()
" Don't write viminfo on exit.
set viminfo=

if s:fail == 0 && s:fail_expected == 0 && s:pending == 0
if s:fail == 0 && s:fail_expected == 0
" Success, create the .res file so that make knows it's done.
exe 'split ' . fnamemodify(g:testname, ':r') . '.res'
write
Expand Down Expand Up @@ -548,12 +538,6 @@ func FinishTesting()
call add(s:messages, message)
call extend(s:messages, s:errors_expected)
endif
if s:pending > 0
let message = s:pending . ' FAILED (pending):'
echo message
call add(s:messages, message)
call extend(s:messages, s:errors_pending)
endif

" Add SKIPPED messages
call extend(s:messages, s:skipped)
Expand All @@ -578,8 +562,6 @@ let s:errors = []
let s:errors_expected = []
let s:messages = []
let s:skipped = []
let s:pending = 0
let s:errors_pending = []
if expand('%') =~ 'test_vimscript.vim'
" this test has intentional errors, don't use try/catch.
source %
Expand Down
Loading