Skip to content

Commit 79932f9

Browse files
committed
Fix and re-enable some tests
1 parent 333ea1c commit 79932f9

4 files changed

Lines changed: 0 additions & 20 deletions

File tree

src/testdir/test_channel.vim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ if !has('channel')
44
finish
55
endif
66

7-
if has('gui_macvim')
8-
" MacVim's currently doesn't always pass these tests. Disable these tests
9-
" for now before a more proper fix is implemented.
10-
finish
11-
endif
12-
137
source shared.vim
148

159
let s:python = PythonProg()

src/testdir/test_stat.vim

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,13 @@ func Test_getftype()
142142
call delete('Xfifo')
143143
endif
144144

145-
if !has("gui_macvim")
146145
for cdevfile in systemlist('find /dev -type c -maxdepth 2 2>/dev/null')
147146
let type = getftype(cdevfile)
148147
" ignore empty result, can happen if the file disappeared
149148
if type != ''
150149
call assert_equal('cdev', type)
151150
endif
152151
endfor
153-
endif
154152

155153
for bdevfile in systemlist('find /dev -type b -maxdepth 2 2>/dev/null')
156154
let type = getftype(bdevfile)

src/testdir/test_terminal.vim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -645,12 +645,6 @@ func Test_terminal_write_stdin()
645645
endfunc
646646

647647
func Test_terminal_no_cmd()
648-
if has('gui_macvim') && has('gui_running')
649-
" MacVim: For some reason this test is failing in GUI unit tests. Need to
650-
" investigate.
651-
return
652-
endif
653-
654648
let buf = term_start('NONE', {})
655649
call assert_notequal(0, buf)
656650

src/testdir/test_timers.vim

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,6 @@ if !has('timers')
44
finish
55
endif
66

7-
if has('gui_macvim')
8-
" MacVim's GUI currently doesn't always pass these tests. Disable these
9-
" tests for now when testing before a more proper fix is implemented.
10-
finish
11-
endif
12-
137
source shared.vim
148
source screendump.vim
159

0 commit comments

Comments
 (0)