aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.0.1054: terminal test fails on MS-Windows

Browse Source 
Problem:    Terminal test fails on MS-Windows.
Solution:   Disable the redirection test for now.  Improve scrape test to make
            it less flaky.
This commit is contained in:
Bram Moolenaar 2017-09-04 22:23:19 +02:00
parent 9d954207e2
commit 178333783f
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/testdir/test_terminal.vim
View File

@ -165,7 +165,9 @@ func Test_terminal_scrape_123()
call term_wait(buf) call term_wait(buf)
let g:buf = buf let g:buf = buf
call WaitFor('len(term_scrape(g:buf, 1)) > 0') " On MS-Windows we first get a startup message of two lines, wait for the
" "cls" to happen, after that we have one line.
call WaitFor('len(term_scrape(g:buf, 1)) == 1')
call Check_123(buf) call Check_123(buf)
" Must still work after the job ended. " Must still work after the job ended.
@ -590,12 +592,15 @@ func Test_terminal_wrong_options()
endfunc endfunc
func Test_terminal_redir_file() func Test_terminal_redir_file()
" TODO: this should work on MS-Window
if has('unix')
let cmd = Get_cat_123_cmd() let cmd = Get_cat_123_cmd()
let buf = term_start(cmd, {'out_io': 'file', 'out_name': 'Xfile'}) let buf = term_start(cmd, {'out_io': 'file', 'out_name': 'Xfile'})
call term_wait(buf) call term_wait(buf)
call WaitFor('len(readfile("Xfile")) > 0') call WaitFor('len(readfile("Xfile")) > 0')
call assert_match('123', readfile('Xfile')[0]) call assert_match('123', readfile('Xfile')[0])
call delete('Xfile') call delete('Xfile')
endif
if has('unix') if has('unix')
let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'}) let buf = term_start('xyzabc', {'err_io': 'file', 'err_name': 'Xfile'})

2
src/version.c
View File

@ -769,6 +769,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1054,
/**/ /**/
1053, 1053,
/**/ /**/