diff options
author | Hans Nilsson <[email protected]> | 2018-03-01 10:23:37 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-03-01 10:23:37 +0100 |
commit | 9574395f47164982baf9c31258c696a7f950f582 (patch) | |
tree | 98e3d16318bd236bc216f9033fcdc5303deeeeeb /lib/ssh/test/ssh_basic_SUITE.erl | |
parent | 92c4f5db635d286f0ca81ecf9e095f1dcfa40754 (diff) | |
parent | b9d8918e6dade84e77c01ceab0e12e9c55266cf3 (diff) | |
download | otp-9574395f47164982baf9c31258c696a7f950f582.tar.gz otp-9574395f47164982baf9c31258c696a7f950f582.tar.bz2 otp-9574395f47164982baf9c31258c696a7f950f582.zip |
Merge branch 'hans/ssh/cuddle_tests' into maint
* hans/ssh/cuddle_tests:
ssh: Insert missing ssh:stop() etc in test suites
ssh: Fix acceptor sup testcase
ssh: Fix cli testcase
ssh: Misspelling in test suite
ssh: Put common user_dir setup in ssh_options_SUITE:init_per_testcases/2
Diffstat (limited to 'lib/ssh/test/ssh_basic_SUITE.erl')
-rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 202b0afe57..d16b169da3 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -764,11 +764,11 @@ cli(Config) when is_list(Config) -> {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity), ssh_connection:shell(ConnectionRef, ChannelId), - ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>), + ssh_connection:send(ConnectionRef, ChannelId, <<"q">>), receive {ssh_cm, ConnectionRef, {data,0,0, <<"\r\nYou are accessing a dummy, type \"q\" to exit\r\n\n">>}} -> - ok = ssh_connection:send(ConnectionRef, ChannelId, <<"q">>) + ssh_connection:send(ConnectionRef, ChannelId, <<"q">>) after 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) end, @@ -1491,7 +1491,7 @@ new_do_shell(IO, N, Ops=[{Order,Arg}|More]) -> ct:fail("*** Expected ~p, but got ~p",[string:strip(ExpStr),RecStr]) end after 30000 -> - ct:log("Meassage queue of ~p:~n~p", + ct:log("Message queue of ~p:~n~p", [self(), erlang:process_info(self(), messages)]), case Order of expect -> ct:fail("timeout, expected ~p",[string:strip(Arg)]); |