diff options
| author | Hans Nilsson <[email protected]> | 2016-04-14 10:28:04 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-04-29 13:17:52 +0200 |
| commit | 223b123f576e726c18bcd38fa2b866d23f1a14a3 (patch) | |
| tree | 728d1c6389f84669b9360a25ff5ef8b5e2b72234 /lib/ssh/test/ssh_algorithms_SUITE.erl | |
| parent | 0977a597432d018ff0edb3895a32f78a08647b85 (diff) | |
| download | otp-223b123f576e726c18bcd38fa2b866d23f1a14a3.tar.gz otp-223b123f576e726c18bcd38fa2b866d23f1a14a3.tar.bz2 otp-223b123f576e726c18bcd38fa2b866d23f1a14a3.zip | |
ssh: breakout rcv_expected to ssh_test_lib.erl
Diffstat (limited to 'lib/ssh/test/ssh_algorithms_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_algorithms_SUITE.erl | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/lib/ssh/test/ssh_algorithms_SUITE.erl b/lib/ssh/test/ssh_algorithms_SUITE.erl index e6fc7662f9..3a8eec46a8 100644 --- a/lib/ssh/test/ssh_algorithms_SUITE.erl +++ b/lib/ssh/test/ssh_algorithms_SUITE.erl @@ -231,25 +231,10 @@ sshc_simple_exec(Config) -> " -o StrictHostKeyChecking=no", " ",Host," 1+1."]), ct:log("~p",[Cmd]), - SshPort = open_port({spawn, Cmd}, [binary]), - Expect = <<"2\n">>, - rcv_expected(SshPort, Expect). - - -rcv_expected(SshPort, Expect) -> - receive - {SshPort, {data,Expect}} -> - ct:log("Got expected ~p from ~p",[Expect,SshPort]), - catch port_close(SshPort), - ok; - Other -> - ct:log("Got UNEXPECTED ~p",[Other]), - rcv_expected(SshPort, Expect) - - after ?TIMEOUT -> - catch port_close(SshPort), - ct:fail("Did not receive answer") - end. + SshPort = open_port({spawn, Cmd}, [binary, stderr_to_stdout, + overlapped_io %only affects windows + ]), + ssh_test_lib:rcv_expected({data,<<"2\n">>}, SshPort, ?TIMEOUT). %%-------------------------------------------------------------------- %% Connect to the ssh server of the OS |