diff options
| author | Hans Nilsson <[email protected]> | 2017-12-22 16:15:37 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2017-12-22 16:15:37 +0100 |
| commit | 0c08677522f1add0f6161328a0009e3ac3401f1e (patch) | |
| tree | bd94782c4588d6b9b8b2480e4dad38c38e627065 /lib/ssh/test/ssh_sftpd_SUITE.erl | |
| parent | 9cfb523632b6ed2b5e04bec5c67ede70875ca931 (diff) | |
| parent | 4ec9ee4fc8893b526f1686da66b90bdf69f8f343 (diff) | |
| download | otp-0c08677522f1add0f6161328a0009e3ac3401f1e.tar.gz otp-0c08677522f1add0f6161328a0009e3ac3401f1e.tar.bz2 otp-0c08677522f1add0f6161328a0009e3ac3401f1e.zip | |
Merge branch 'hans/ssh/cuddle_ssh_test' into maint
* hans/ssh/cuddle_ssh_test:
ssh: Better reports in some test case failures
ssh: Tests - timeout catches external ssh that does not disconnect
Diffstat (limited to 'lib/ssh/test/ssh_sftpd_SUITE.erl')
| -rw-r--r-- | lib/ssh/test/ssh_sftpd_SUITE.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl index 763649a12f..5fc948fbed 100644 --- a/lib/ssh/test/ssh_sftpd_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_SUITE.erl @@ -34,7 +34,7 @@ -define(PASSWD, "Sesame"). -define(XFER_PACKET_SIZE, 32768). -define(XFER_WINDOW_SIZE, 4*?XFER_PACKET_SIZE). --define(TIMEOUT, 10000). +-define(SSH_TIMEOUT, 10000). -define(REG_ATTERS, <<0,0,0,0,1>>). -define(UNIX_EPOCH, 62167219200). @@ -161,9 +161,9 @@ init_per_testcase(TestCase, Config) -> {silently_accept_hosts, true}]), {ok, Channel} = ssh_connection:session_channel(Cm, ?XFER_WINDOW_SIZE, - ?XFER_PACKET_SIZE, ?TIMEOUT), + ?XFER_PACKET_SIZE, ?SSH_TIMEOUT), - success = ssh_connection:subsystem(Cm, Channel, "sftp", ?TIMEOUT), + success = ssh_connection:subsystem(Cm, Channel, "sftp", ?SSH_TIMEOUT), ProtocolVer = case atom_to_list(TestCase) of "ver3_" ++ _ -> |