diff options
| author | Erlang/OTP <[email protected]> | 2015-07-01 15:54:13 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2015-07-01 15:54:13 +0200 |
| commit | 73da9471177f9b5b67f063cd88f029f687864c50 (patch) | |
| tree | 2dde068635cccc4e7607c86092f581f2ebb94019 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | fb794658ae54b304219c907648f230decf10d622 (diff) | |
| parent | 85bf0f9627122416048e2fc9d102e76b84d36467 (diff) | |
| download | otp-73da9471177f9b5b67f063cd88f029f687864c50.tar.gz otp-73da9471177f9b5b67f063cd88f029f687864c50.tar.bz2 otp-73da9471177f9b5b67f063cd88f029f687864c50.zip | |
Merge branch 'ia/ssh/backport/OTP-12884' into maint-r15
* ia/ssh/backport/OTP-12884:
ssh: Fix test case issue
ssh: Use old crypto with newer ssh
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 695a7caa7d..eabaca3248 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -395,7 +395,7 @@ mk_rm_dir(Config) when is_list(Config) -> _/binary>>, _} = mkdir(DirName, Cm, Channel, ReqId), NewReqId = 1, - {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FAILURE), + {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FILE_ALREADY_EXISTS), _/binary>>, _} = mkdir(DirName, Cm, Channel, NewReqId), NewReqId1 = 2, |