aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_test_lib.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-13 15:26:14 +0200
committerHans Nilsson <[email protected]>2015-10-13 15:26:14 +0200
commit11229947bed829ee0691d9669a4858fd8cf6cbb7 (patch)
treea7b20c66a103222093d24d29a9c563c7a596eaef /lib/ssh/test/ssh_test_lib.erl
parentc0178877c9d404b90d71f52e6324d5c40ceae905 (diff)
parent3c787f47ffc660d77eba3528b10eba570529fb9e (diff)
downloadotp-11229947bed829ee0691d9669a4858fd8cf6cbb7.tar.gz
otp-11229947bed829ee0691d9669a4858fd8cf6cbb7.tar.bz2
otp-11229947bed829ee0691d9669a4858fd8cf6cbb7.zip
Merge branch 'maint'
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
-rw-r--r--lib/ssh/test/ssh_test_lib.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl
index cc3ebf8151..87eaeec1bc 100644
--- a/lib/ssh/test/ssh_test_lib.erl
+++ b/lib/ssh/test/ssh_test_lib.erl
@@ -163,7 +163,9 @@ loop_io_server(TestCase, Buff0) ->
{'EXIT',_, _} ->
erlang:display('ssh_test_lib:loop_io_server/2 EXIT'),
ok
- end.
+ after
+ 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
+ end.
io_request({put_chars, Chars}, TestCase, _, _, Buff) ->
reply(TestCase, Chars),
@@ -212,6 +214,8 @@ receive_exec_result(Msg) ->
Other ->
ct:log("Other ~p", [Other]),
{unexpected_msg, Other}
+ after
+ 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
end.