From 51c23687a9298c27d41ad9780b032f434e1e1646 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Mon, 14 Aug 2017 21:45:00 +0200
Subject: patch 8.0.0939: Test_terminal_env is flaky

Problem:    Test_terminal_env is flaky. (James McCoy)
Solution:   Use WaitFor() instead of term_wait().
---
 src/testdir/test_terminal.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/testdir/test_terminal.vim')

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'
-- 
cgit v1.2.1