# HG changeset patch
# User Christian Brabandt <cb@256bit.org>
# Date 1502740806 -7200
# Node ID bf53df1f17ba02018f4b7597988bd84913481383
# Parent  b8426b79c762febea1637a37ce4de589b145280c
patch 8.0.0939: Test_terminal_env is flaky

commit https://github.com/vim/vim/commit/51c23687a9298c27d41ad9780b032f434e1e1646
Author: Bram Moolenaar <Bram@vim.org>
Date:   Mon Aug 14 21:45:00 2017 +0200

    patch 8.0.0939: Test_terminal_env is flaky

    Problem:    Test_terminal_env is flaky. (James McCoy)
    Solution:   Use WaitFor() instead of term_wait().

diff --git a/src/testdir/test_terminal.vim b/src/testdir/test_terminal.vim
--- a/src/testdir/test_terminal.vim
+++ b/src/testdir/test_terminal.vim
@@ -410,11 +410,12 @@ func Test_terminal_env()
     return
   endif
   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_wait(buf)
   call Stop_shell_in_terminal(buf)
-  call term_wait(buf)
+  call WaitFor('getline(2) == "correct"')
   call assert_equal('correct', getline(2))
 
   exe buf . 'bwipe'
diff --git a/src/version.c b/src/version.c
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    939,
+/**/
     938,
 /**/
     937,