From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 14 Aug 2017 19:45:00 +0000 (+0200)
Subject: patch 8.0.0939: Test_terminal_env is flaky
X-Git-Tag: v8.0.0939
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51c23687a9298c27d41ad9780b032f434e1e1646;p=vim

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
index e18087bbd..b311c3629 100644
--- 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
index a8b07dcbe..4978e8772 100644
--- a/src/version.c
+++ b/src/version.c
@@ -769,6 +769,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    939,
 /**/
     938,
 /**/