diff options
| author | Hans <[email protected]> | 2015-06-04 15:19:15 +0200 |
|---|---|---|
| committer | Hans <[email protected]> | 2015-06-04 15:19:15 +0200 |
| commit | 802f297763e12ee02b1669fd1fcf502aee4665b7 (patch) | |
| tree | 85ebdaab025fd906b258919afe069e04ee96e159 | |
| parent | def3336c4e7f1fd2210ded405263bcad293cdc25 (diff) | |
| download | otp-802f297763e12ee02b1669fd1fcf502aee4665b7.tar.gz otp-802f297763e12ee02b1669fd1fcf502aee4665b7.tar.bz2 otp-802f297763e12ee02b1669fd1fcf502aee4665b7.zip | |
ssh: Replace ct:sleep with timer:sleep for long sleeps
On two of our test machines, ct:sleep was scaled to a ridicously long time (10 x). This made the key renegotiation to trigger wich the test case was designed not to tolerate.
By reducing the sleep time to the intended order of magnitude, hopfully the test cases will work.
| -rw-r--r-- | lib/ssh/test/ssh_basic_SUITE.erl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl index 7eaf1b1b53..a35e6e691a 100644 --- a/lib/ssh/test/ssh_basic_SUITE.erl +++ b/lib/ssh/test/ssh_basic_SUITE.erl @@ -383,28 +383,28 @@ rekey_limit(Config) -> Kex1 = get_kex_init(ConnectionRef), - ct:sleep(?REKEY_DATA_TMO), + timer:sleep(?REKEY_DATA_TMO), Kex1 = get_kex_init(ConnectionRef), Data = lists:duplicate(9000,1), ok = ssh_sftp:write_file(SftpPid, DataFile, Data), - ct:sleep(?REKEY_DATA_TMO), + timer:sleep(?REKEY_DATA_TMO), Kex2 = get_kex_init(ConnectionRef), false = (Kex2 == Kex1), - ct:sleep(?REKEY_DATA_TMO), + timer:sleep(?REKEY_DATA_TMO), Kex2 = get_kex_init(ConnectionRef), ok = ssh_sftp:write_file(SftpPid, DataFile, "hi\n"), - ct:sleep(?REKEY_DATA_TMO), + timer:sleep(?REKEY_DATA_TMO), Kex2 = get_kex_init(ConnectionRef), false = (Kex2 == Kex1), - ct:sleep(?REKEY_DATA_TMO), + timer:sleep(?REKEY_DATA_TMO), Kex2 = get_kex_init(ConnectionRef), @@ -446,7 +446,7 @@ renegotiate1(Config) -> ssh_connection_handler:renegotiate(ConnectionRef), spawn(fun() -> ok=ssh_sftp:write(SftpPid, Handle, "another hi\n") end), - ct:sleep(2000), + timer:sleep(2000), Kex2 = get_kex_init(ConnectionRef), @@ -494,7 +494,7 @@ renegotiate2(Config) -> ssh_connection_handler:renegotiate(ConnectionRef), ssh_relay:release(RelayPid, rx), - ct:sleep(2000), + timer:sleep(2000), Kex2 = get_kex_init(ConnectionRef), |