aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_test_lib.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-10-13 15:25:23 +0200
committerHans Nilsson <[email protected]>2015-10-13 15:25:23 +0200
commit3c787f47ffc660d77eba3528b10eba570529fb9e (patch)
treee92c15417b6aba8b4cc291f99c28f9a862d4c271 /lib/ssh/test/ssh_test_lib.erl
parent308de032b8cb291e5fcd80ba2e0a21f260161511 (diff)
parentba6603d2f3b4853bfbaeecdec6413ecee19f84d4 (diff)
downloadotp-3c787f47ffc660d77eba3528b10eba570529fb9e.tar.gz
otp-3c787f47ffc660d77eba3528b10eba570529fb9e.tar.bz2
otp-3c787f47ffc660d77eba3528b10eba570529fb9e.zip
Merge branch 'hans/ssh/cuddle_tests' into 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.