diff options
| author | Hans Nilsson <[email protected]> | 2015-12-09 15:54:08 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-12-09 15:54:08 +0100 |
| commit | 5690f3b07d4589ef9f843e8e9a96300bae492dee (patch) | |
| tree | 65a0e5b62f13a4ef6f23c52f5daf01eef4bf9a04 /lib/ssh | |
| parent | 5ba841502a5f3f1ba1594c1b17957178d4606af5 (diff) | |
| parent | 683bd27d59162078248eb52d6190158f2cec5a26 (diff) | |
| download | otp-5690f3b07d4589ef9f843e8e9a96300bae492dee.tar.gz otp-5690f3b07d4589ef9f843e8e9a96300bae492dee.tar.bz2 otp-5690f3b07d4589ef9f843e8e9a96300bae492dee.zip | |
Merge branch 'maint'
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 18690d8669..02cc79e4d5 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -366,13 +366,17 @@ erlang_server_openssh_client_public_key_dsa(Config) when is_list(Config) -> Cmd = "ssh -p " ++ integer_to_list(Port) ++ " -o UserKnownHostsFile=" ++ KnownHosts ++ " " ++ Host ++ " 1+1.", - SshPort = open_port({spawn, Cmd}, [binary]), + SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout]), receive {SshPort,{data, <<"2\n">>}} -> ok after ?TIMEOUT -> - ct:fail("Did not receive answer") + receive + X -> ct:fail("Received: ~p",[X]) + after 0 -> + ct:fail("Did not receive answer") + end end, ssh:stop_daemon(Pid). |