diff options
| author | Hans Nilsson <[email protected]> | 2015-08-25 15:36:18 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2015-08-25 15:36:18 +0200 |
| commit | 49d30519579afcdf15807dd6635b962831b55fc5 (patch) | |
| tree | 93d9c3634cedcde2b81f3d5bf80c380d1a045e68 /lib/ssh | |
| parent | 4d51ad280e5bdfe270bca772476e2e029520a2b2 (diff) | |
| parent | bc28d2308209ffc7cec0218028fc62b88a413f0f (diff) | |
| download | otp-49d30519579afcdf15807dd6635b962831b55fc5.tar.gz otp-49d30519579afcdf15807dd6635b962831b55fc5.tar.bz2 otp-49d30519579afcdf15807dd6635b962831b55fc5.zip | |
Merge branch 'hans/ssh/prolong_short_timetrap' into maint
* hans/ssh/prolong_short_timetrap:
ssh: doubled short timetrap in testcase
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/test/ssh_sftp_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl index bab5bf9fe9..8d0b887d83 100644 --- a/lib/ssh/test/ssh_sftp_SUITE.erl +++ b/lib/ssh/test/ssh_sftp_SUITE.erl @@ -291,7 +291,7 @@ init_per_testcase(Case, Config0) -> prep(Config0), Config1 = lists:keydelete(watchdog, 1, Config0), Config2 = lists:keydelete(sftp, 1, Config1), - Dog = ct:timetrap(?default_timeout), + Dog = ct:timetrap(2 * ?default_timeout), User = ?config(user, Config0), Passwd = ?config(passwd, Config0), |