|
6 | 6 |
|
7 | 7 | source shared.vim |
8 | 8 |
|
| 9 | +let s:python = PythonProg() |
| 10 | + |
9 | 11 | " Open a terminal with a shell, assign the job to g:job and return the buffer |
10 | 12 | " number. |
11 | 13 | func Run_shell_in_terminal(options) |
@@ -319,41 +321,46 @@ func Test_terminal_curwin() |
319 | 321 | endfunc |
320 | 322 |
|
321 | 323 | func Test_finish_close() |
322 | | - " TODO: use something that takes much less than a whole second |
323 | | - echo 'This will take five seconds...' |
324 | 324 | call assert_equal(1, winnr('$')) |
325 | 325 |
|
326 | | - if has('win32') |
327 | | - let cmd = $windir . '\system32\timeout.exe 1' |
| 326 | + if s:python != '' |
| 327 | + let cmd = s:python . " test_short_sleep.py" |
| 328 | + let waittime = 500 |
328 | 329 | else |
329 | | - let cmd = 'sleep 1' |
| 330 | + echo 'This will take five seconds...' |
| 331 | + let waittime = 2000 |
| 332 | + if has('win32') |
| 333 | + let cmd = $windir . '\system32\timeout.exe 1' |
| 334 | + else |
| 335 | + let cmd = 'sleep 1' |
| 336 | + endif |
330 | 337 | endif |
| 338 | + |
331 | 339 | exe 'terminal ++close ' . cmd |
332 | 340 | let buf = bufnr('') |
333 | 341 | call assert_equal(2, winnr('$')) |
334 | | - |
335 | 342 | wincmd p |
336 | | - sleep 1200 msec |
| 343 | + call WaitFor("winnr('$') == 1", waittime) |
337 | 344 | call assert_equal(1, winnr('$')) |
338 | 345 |
|
339 | 346 | call term_start(cmd, {'term_finish': 'close'}) |
340 | 347 | call assert_equal(2, winnr('$')) |
341 | 348 | let buf = bufnr('') |
342 | 349 | wincmd p |
343 | | - sleep 1200 msec |
| 350 | + call WaitFor("winnr('$') == 1", waittime) |
344 | 351 | call assert_equal(1, winnr('$')) |
345 | 352 |
|
346 | 353 | exe 'terminal ++open ' . cmd |
347 | 354 | let buf = bufnr('') |
348 | 355 | close |
349 | | - sleep 1200 msec |
| 356 | + call WaitFor("winnr('$') == 2", waittime) |
350 | 357 | call assert_equal(2, winnr('$')) |
351 | 358 | bwipe |
352 | 359 |
|
353 | 360 | call term_start(cmd, {'term_finish': 'open'}) |
354 | 361 | let buf = bufnr('') |
355 | 362 | close |
356 | | - sleep 1200 msec |
| 363 | + call WaitFor("winnr('$') == 2", waittime) |
357 | 364 | call assert_equal(2, winnr('$')) |
358 | 365 |
|
359 | 366 | bwipe |
|
0 commit comments