aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2014-09-17 09:36:15 +0200
committerIngela Anderton Andin <[email protected]>2014-09-18 14:47:34 +0200
commitd4d7231a24c697085ddf89fcdfac506b7e732e5c (patch)
tree98f1dafd272df641371fb9742388dca4b32d4d5c
parent9fc5ce2f25490bb895df02326cd8fd04d4e8e0b5 (diff)
downloadotp-d4d7231a24c697085ddf89fcdfac506b7e732e5c.tar.gz
otp-d4d7231a24c697085ddf89fcdfac506b7e732e5c.tar.bz2
otp-d4d7231a24c697085ddf89fcdfac506b7e732e5c.zip
ssh: Avoid timeout of init_per_test_case on some platforms
Also some code cleanup
-rw-r--r--lib/ssh/test/ssh_connection_SUITE.erl12
-rw-r--r--lib/ssh/test/ssh_to_openssh_SUITE.erl5
2 files changed, 10 insertions, 7 deletions
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index c115ccee5f..c52b91986b 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -302,7 +302,7 @@ start_shell(Config) when is_list(Config) ->
ok = ssh_connection:shell(ConnectionRef,ChannelId0),
receive
- {ssh_cm,ConnectionRef, {data, ChannelId, 0, <<"Enter command\r\n">>}} ->
+ {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"Enter command\r\n">>}} ->
ok
after 5000 ->
ct:fail("CLI Timeout")
@@ -335,8 +335,8 @@ start_shell_exec(Config) when is_list(Config) ->
success = ssh_connection:exec(ConnectionRef, ChannelId0,
"testing", infinity),
receive
- {ssh_cm,ConnectionRef, {data, ChannelId, 0, <<"testing\r\n">>}} ->
- ok
+ {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
+ ok
after 5000 ->
ct:fail("Exec Timeout")
end,
@@ -370,8 +370,8 @@ start_shell_exec_fun(Config) when is_list(Config) ->
"testing", infinity),
receive
- {ssh_cm,ConnectionRef, {data, ChannelId, 0, <<"testing\r\n">>}} ->
- ok
+ {ssh_cm, ConnectionRef, {data, _ChannelId, 0, <<"testing\r\n">>}} ->
+ ok
after 5000 ->
ct:fail("Exec Timeout")
end,
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 3500bf012b..35179adf28 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -564,4 +564,7 @@ check_ssh_client_support2(P) ->
check_ssh_client_support2(P);
{P, {exit_status, E}} ->
E
+ after 5000 ->
+ ct:pal("Openssh command timed out ~n"),
+ -1
end.