Mercurial > vim
changeset 12062:191ccece2f5d v8.0.0911
patch 8.0.0911: terminal test takes too long
commit https://github.com/vim/vim/commit/b81bc77ae7e43b5aac43970aaa4aa70c619e5009
Author: Bram Moolenaar <Bram@vim.org>
Date: Fri Aug 11 22:45:01 2017 +0200
patch 8.0.0911: terminal test takes too long
Problem: Terminal test takes too long.
Solution: Instead of "sleep 1" use a Python program to briefly sleep.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Fri, 11 Aug 2017 23:00:05 +0200 |
| parents | e3b6d3198a2a |
| children | 2372e456e821 |
| files | src/testdir/test_short_sleep.py src/testdir/test_terminal.vim src/version.c |
| diffstat | 3 files changed, 30 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
new file mode 100644 --- /dev/null +++ b/src/testdir/test_short_sleep.py @@ -0,0 +1,11 @@ +#!/usr/bin/python +# +# Program that sleeps for 100 msec +# +# This requires Python 2.6 or later. + +import time + +if __name__ == "__main__": + + time.sleep(0.1) # sleep 100 msec
--- a/src/testdir/test_terminal.vim +++ b/src/testdir/test_terminal.vim @@ -6,6 +6,8 @@ endif source shared.vim +let s:python = PythonProg() + " Open a terminal with a shell, assign the job to g:job and return the buffer " number. func Run_shell_in_terminal(options) @@ -319,41 +321,46 @@ func Test_terminal_curwin() endfunc func Test_finish_close() - " TODO: use something that takes much less than a whole second - echo 'This will take five seconds...' call assert_equal(1, winnr('$')) - if has('win32') - let cmd = $windir . '\system32\timeout.exe 1' + if s:python != '' + let cmd = s:python . " test_short_sleep.py" + let waittime = 500 else - let cmd = 'sleep 1' + echo 'This will take five seconds...' + let waittime = 2000 + if has('win32') + let cmd = $windir . '\system32\timeout.exe 1' + else + let cmd = 'sleep 1' + endif endif + exe 'terminal ++close ' . cmd let buf = bufnr('') call assert_equal(2, winnr('$')) - wincmd p - sleep 1200 msec + call WaitFor("winnr('$') == 1", waittime) call assert_equal(1, winnr('$')) call term_start(cmd, {'term_finish': 'close'}) call assert_equal(2, winnr('$')) let buf = bufnr('') wincmd p - sleep 1200 msec + call WaitFor("winnr('$') == 1", waittime) call assert_equal(1, winnr('$')) exe 'terminal ++open ' . cmd let buf = bufnr('') close - sleep 1200 msec + call WaitFor("winnr('$') == 2", waittime) call assert_equal(2, winnr('$')) bwipe call term_start(cmd, {'term_finish': 'open'}) let buf = bufnr('') close - sleep 1200 msec + call WaitFor("winnr('$') == 2", waittime) call assert_equal(2, winnr('$')) bwipe