diff options
| author | Hans Nilsson <[email protected]> | 2018-01-29 12:34:25 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-01-29 12:34:25 +0100 |
| commit | db9e04d0f4337a2b32376a41275ecedfe0258c1f (patch) | |
| tree | 6587c001ea3d27da3f88a30c0a70f5e997a96507 /lib/ssh/test/ssh_test_lib.erl | |
| parent | 80de6b173fb12cfdb0b511531a4b0d2ad33d4098 (diff) | |
| parent | 0169c569052824dd95c045f977219d9022339cc7 (diff) | |
| download | otp-db9e04d0f4337a2b32376a41275ecedfe0258c1f.tar.gz otp-db9e04d0f4337a2b32376a41275ecedfe0258c1f.tar.bz2 otp-db9e04d0f4337a2b32376a41275ecedfe0258c1f.zip | |
Merge branch 'hans/ssh/docker_compat_tests/OTP-14194' into maint
* hans/ssh/docker_compat_tests/OTP-14194:
ssh: Disable test failing if docker command exists
ssh: Skeleton of build scripts for DropBear image
ssh: Can use DropBear SSH dockers
ssh: Remove duplicate test cases from ssh_to_openssh_SUITE
ssh: Add more tests
ssh: Change the default list of ssh and ssl version images
ssh: Enable building openssh 0.9.8[a-l]
ssh: Add LibreSSL to compat tests
Diffstat (limited to 'lib/ssh/test/ssh_test_lib.erl')
| -rw-r--r-- | lib/ssh/test/ssh_test_lib.erl | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_test_lib.erl b/lib/ssh/test/ssh_test_lib.erl index 2d7bf75847..f97c3b1352 100644 --- a/lib/ssh/test/ssh_test_lib.erl +++ b/lib/ssh/test/ssh_test_lib.erl @@ -53,7 +53,7 @@ daemon(Host, Options) -> daemon(Host, Port, Options) -> - ct:log("~p:~p Calling ssh:daemon(~p, ~p, ~p)",[?MODULE,?LINE,Host,Port,Options]), + %% ct:log("~p:~p Calling ssh:daemon(~p, ~p, ~p)",[?MODULE,?LINE,Host,Port,Options]), case ssh:daemon(Host, Port, Options) of {ok, Pid} -> {ok,L} = ssh:daemon_info(Pid), @@ -199,15 +199,17 @@ init_io_server(TestCase) -> loop_io_server(TestCase, Buff0) -> receive - {input, TestCase, Line} -> + {input, TestCase, Line} = _INP -> + %%ct:log("io_server ~p:~p ~p got ~p",[?MODULE,?LINE,self(),_INP]), loop_io_server(TestCase, Buff0 ++ [Line]); - {io_request, From, ReplyAs, Request} -> + {io_request, From, ReplyAs, Request} = _REQ-> + %%ct:log("io_server ~p:~p ~p got ~p",[?MODULE,?LINE,self(),_REQ]), {ok, Reply, Buff} = io_request(Request, TestCase, From, ReplyAs, Buff0), io_reply(From, ReplyAs, Reply), loop_io_server(TestCase, Buff); {'EXIT',_, _} = _Exit -> -%% ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]), + ct:log("ssh_test_lib:loop_io_server/2 got ~p",[_Exit]), ok after 30000 -> ct:fail("timeout ~p:~p",[?MODULE,?LINE]) |