diff options
| author | Hans Nilsson <[email protected]> | 2016-05-02 13:09:04 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2016-05-02 13:09:04 +0200 |
| commit | 4921b2704b761a7dd87a17494a8b8336237a240a (patch) | |
| tree | 2e08ed3b14befc71a5f9181fcdfa23c11b6d9581 /lib/ssh/test/ssh_test_cli.erl | |
| parent | 8a7789a5814dad194310d08dafc4421d22b3c89f (diff) | |
| parent | 8bfcd11948895164d1841c0c00450b0e26cb9927 (diff) | |
| download | otp-4921b2704b761a7dd87a17494a8b8336237a240a.tar.gz otp-4921b2704b761a7dd87a17494a8b8336237a240a.tar.bz2 otp-4921b2704b761a7dd87a17494a8b8336237a240a.zip | |
Merge branch 'hans/ssh/cuddle_tests'
Conflicts:
lib/ssh/test/ssh_algorithms_SUITE.erl
Diffstat (limited to 'lib/ssh/test/ssh_test_cli.erl')
| -rw-r--r-- | lib/ssh/test/ssh_test_cli.erl | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/lib/ssh/test/ssh_test_cli.erl b/lib/ssh/test/ssh_test_cli.erl index 697ddb730d..f96b9967d2 100644 --- a/lib/ssh/test/ssh_test_cli.erl +++ b/lib/ssh/test/ssh_test_cli.erl @@ -75,10 +75,11 @@ terminate(_Why, _S) -> run_portprog(User, cli, TmpDir) -> Pty_bin = os:find_executable("cat"), - open_port({spawn_executable, Pty_bin}, - [stream, {cd, TmpDir}, {env, [{"USER", User}]}, - {args, []}, binary, - exit_status, use_stdio, stderr_to_stdout]). + ssh_test_lib:open_port({spawn_executable, Pty_bin}, + [stream, + {cd, TmpDir}, + {env, [{"USER", User}]}, + {args, []}]). get_ssh_user(Ref) -> [{user, User}] = ssh:connection_info(Ref, [user]), |