aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/test/ssh_sftpd_SUITE.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_sftpd_SUITE.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_sftpd_SUITE.erl')
-rw-r--r--lib/ssh/test/ssh_sftpd_SUITE.erl2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index 94a54ec9db..6b03a2b763 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -683,6 +683,8 @@ reply(Cm, Channel, RBuf) ->
closed;
{ssh_cm, Cm, Msg} ->
ct:fail(Msg)
+ after
+ 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE])
end.