From e00e62392040ddc328cd0581b4743a4edebe25ab Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 19 Sep 2014 22:26:30 +0200
Subject: ssh: Avoid windows wierdness

---
 lib/ssh/test/ssh_to_openssh_SUITE.erl | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 35179adf28..41fbd324c4 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -119,15 +119,7 @@ erlang_shell_client_openssh_server(Config) when is_list(Config) ->
     IO ! {input, self(), "echo Hej\n"},
     receive_hej(),
     IO ! {input, self(), "exit\n"},
-    receive
-	<<"logout">> ->
-	    receive
-		<<"Connection closed">> ->
-		    ok
-	    end;
-	Other0 ->
-	    ct:fail({unexpected_msg, Other0})
-    end,
+    receive_logout(),
     receive
 	{'EXIT', Shell, normal} ->
 	    ok;
@@ -544,6 +536,21 @@ receive_hej() ->
 	    receive_hej()
     end.
 
+receive_logout() ->
+    receive
+	<<"logout">> ->
+	    receive
+		<<"Connection closed">> ->
+		    ok
+	    end;
+	<<"TERM environment variable not set.\n">> -> %% Windows work around
+	    receive_logout();
+	Other0 ->
+	    ct:fail({unexpected_msg, Other0})
+    end.
+
+
+
 %%--------------------------------------------------------------------
 %%--------------------------------------------------------------------
 %% Check if we have a "newer" ssh client that supports these test cases
-- 
cgit v1.2.3