thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.0.0939: Test_terminal_env is flaky

Browse Source 
Problem:    Test_terminal_env is flaky. (James McCoy)
Solution:   Use WaitFor() instead of term_wait().
This commit is contained in:
Bram Moolenaar
2017-08-14 21:45:00 +02:00
parent 6bb18a878c
commit 51c23687a9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/testdir/test_terminal.vim
View File

@@ -410,11 +410,12 @@ func Test_terminal_env()
return return
endif endif
let buf = Run_shell_in_terminal({'env': {'TESTENV': 'correct'}}) let buf = Run_shell_in_terminal({'env': {'TESTENV': 'correct'}})
call term_wait(buf) " Wait for the shell to display a prompt
call WaitFor('term_getline(1) != ""')
call term_sendkeys(buf, "echo $TESTENV\r") call term_sendkeys(buf, "echo $TESTENV\r")
call term_wait(buf) call term_wait(buf)
call Stop_shell_in_terminal(buf) call Stop_shell_in_terminal(buf)
call term_wait(buf) call WaitFor('getline(2) == "correct"')
call assert_equal('correct', getline(2)) call assert_equal('correct', getline(2))
exe buf . 'bwipe' exe buf . 'bwipe'

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 */
/**/
939,
/**/ /**/
938, 938,
/**/ /**/