diff options
author | Hans Nilsson <[email protected]> | 2016-03-21 12:38:41 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2016-03-21 12:38:41 +0100 |
commit | 21f1c62d470524157ff775374f6beb22485342bd (patch) | |
tree | fdfd10ea020052e2d56aa08726552f02830017a0 /lib/ssh/test/ssh_to_openssh_SUITE.erl | |
parent | 2569ea2c76c7340e876abf384d7e027dacdd3fc7 (diff) | |
parent | 449e66a2676f4607f43a4e70b3dcad99b9d45a78 (diff) | |
download | otp-21f1c62d470524157ff775374f6beb22485342bd.tar.gz otp-21f1c62d470524157ff775374f6beb22485342bd.tar.bz2 otp-21f1c62d470524157ff775374f6beb22485342bd.zip |
Merge branch 'hans/ssh/set_timetrap_tests'
Diffstat (limited to 'lib/ssh/test/ssh_to_openssh_SUITE.erl')
-rw-r--r-- | lib/ssh/test/ssh_to_openssh_SUITE.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl index 2788bc6b58..80f8607f65 100644 --- a/lib/ssh/test/ssh_to_openssh_SUITE.erl +++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl @@ -34,7 +34,7 @@ %%-------------------------------------------------------------------- suite() -> - [{timetrap,{minutes,1}}]. + [{timetrap,{seconds,40}}]. all() -> case os:find_executable("ssh") of |