Merge remote-tracking branch 'upstream/maint'

1 files changed, 15 insertions, 18 deletions

diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index 6c781e0e91..f4f0682b40 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -73,6 +73,9 @@ end_per_group(_, Config) ->
 
 %%--------------------------------------------------------------------
 init_per_testcase(_TestCase, Config) ->
+    %% To make sure we start clean as it is not certain that
+    %% end_per_testcase will be run!
+    ssh:stop(),
     ssh:start(),
     Config.
 
@@ -91,7 +94,6 @@ simple_exec(Config) when is_list(Config) ->
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
     success = ssh_connection:exec(ConnectionRef, ChannelId0,
 				  "echo testing", infinity),
-
     %% receive response to input
     receive
 	{ssh_cm, ConnectionRef, {data, ChannelId0, 0, <<"testing\n">>}} ->
@@ -146,7 +148,6 @@ small_cat(Config) when is_list(Config) ->
 	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
 	    ok
     end.
-
 %%--------------------------------------------------------------------
 big_cat() ->
     [{doc,"Use 'cat' to echo large data block back to us."}].
@@ -204,37 +205,33 @@ send_after_exit(Config) when is_list(Config) ->
     ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT, [{silently_accept_hosts, true},
 							     {user_interaction, false}]),
     {ok, ChannelId0} = ssh_connection:session_channel(ConnectionRef, infinity),
+    Data = <<"I like spaghetti squash">>,
 
     %% Shell command "false" will exit immediately
     success = ssh_connection:exec(ConnectionRef, ChannelId0,
 				  "false", infinity),
-
-    timer:sleep(2000), %% Allow incoming eof/close/exit_status ssh messages to be processed
-
-    Data = <<"I like spaghetti squash">>,
-    case ssh_connection:send(ConnectionRef, ChannelId0, Data, 2000) of
-	{error, closed} -> ok;
-	ok ->
-	    ct:fail({expected,{error,closed}});
-	{error, timeout} ->
-	    ct:fail({expected,{error,closed}});
-	Else ->
-	    ct:fail(Else)
-    end,
-
-    %% receive close messages
     receive
 	{ssh_cm, ConnectionRef, {eof, ChannelId0}} ->
 	    ok
     end,
     receive
-	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, _}} ->
+	{ssh_cm, ConnectionRef, {exit_status, ChannelId0, _ExitStatus}} ->
 	    ok
     end,
     receive
 	{ssh_cm, ConnectionRef,{closed, ChannelId0}} ->
 	    ok
+    end,
+    case ssh_connection:send(ConnectionRef, ChannelId0, Data, 2000) of
+	{error, closed} -> ok;
+	ok ->
+	    ct:fail({expected,{error,closed}, {got, ok}});
+	{error, timeout} ->
+	    ct:fail({expected,{error,closed}, {got, {error, timeout}}});
+	Else ->
+	    ct:fail(Else)
     end.
+
 %%--------------------------------------------------------------------
 interrupted_send() ->
     [{doc, "Use a subsystem that echos n char and then sends eof to cause a channel exit partway through a large send."}].