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_options_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_options_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_options_SUITE.erl | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_options_SUITE.erl b/lib/ssh/test/ssh_options_SUITE.erl index d64c78da35..cf15ca4253 100644 --- a/lib/ssh/test/ssh_options_SUITE.erl +++ b/lib/ssh/test/ssh_options_SUITE.erl @@ -656,6 +656,8 @@ ssh_connect_arg4_timeout(_Config) -> %% Get listening port Port = receive {port,Server,ServerPort} -> ServerPort + after + 10000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end, %% try to connect with a timeout, but "supervise" it @@ -861,6 +863,8 @@ ssh_connect_nonegtimeout_connected(Config, Parallel) -> ct:sleep(round(Factor * NegTimeOut)), one_shell_op(IO, NegTimeOut) + after + 10000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end, exit(Shell, kill). @@ -869,13 +873,13 @@ one_shell_op(IO, TimeOut) -> ct:log("One shell op: Waiting for prompter"), receive ErlPrompt0 -> ct:log("Erlang prompt: ~p~n", [ErlPrompt0]) - after TimeOut -> ct:fail("Timeout waiting for promter") + after TimeOut -> ct:fail("Timeout waiting for promter") end, IO ! {input, self(), "2*3*7.\r\n"}, receive Echo0 -> ct:log("Echo: ~p ~n", [Echo0]) - after TimeOut -> ct:fail("Timeout waiting for echo") + after TimeOut -> ct:fail("Timeout waiting for echo") end, receive @@ -888,7 +892,7 @@ one_shell_op(IO, TimeOut) -> receive Result0 -> ct:log("Result: ~p~n", [Result0]) - after TimeOut -> ct:fail("Timeout waiting for result") + after TimeOut -> ct:fail("Timeout waiting for result") end. %%-------------------------------------------------------------------- @@ -1016,9 +1020,13 @@ fake_daemon(_Config) -> {ok,S} = Rsa, receive {tcp, S, Id} -> Parent ! {id,self(),Id} + after + 10000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end end), %% Get listening host and port receive {sockname,Server,ServerHost,ServerPort} -> {Server, ServerHost, ServerPort} + after + 10000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end. |