diff options
| author | Hans Nilsson <[email protected]> | 2015-10-13 15:25:23 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-10-13 15:25:23 +0200 |
| commit | 3c787f47ffc660d77eba3528b10eba570529fb9e (patch) | |
| tree | e92c15417b6aba8b4cc291f99c28f9a862d4c271 /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
| parent | 308de032b8cb291e5fcd80ba2e0a21f260161511 (diff) | |
| parent | ba6603d2f3b4853bfbaeecdec6413ecee19f84d4 (diff) | |
| download | otp-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_to_openssh_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index c0dee6a1d3..026fe545c1 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -653,6 +653,8 @@ receive_hej() -> ct:log("Extra info: ~p~n", [Info]), receive_hej() end + after + 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end. receive_logout() -> @@ -662,11 +664,15 @@ receive_logout() -> receive <<"Connection closed">> -> ok + after + 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end; Info -> ct:log("Extra info when logging out: ~p~n", [Info]), receive_logout() - end. + after + 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) + end. receive_normal_exit(Shell) -> receive @@ -676,6 +682,8 @@ receive_normal_exit(Shell) -> receive_normal_exit(Shell); Other -> ct:fail({unexpected_msg, Other}) + after + 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end. extra_logout() -> |