diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2011-05-09 13:26:41 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2011-05-09 13:26:41 +0100 |
| commit | 844ecd7146f5c38eb9b896c4837eb118068fc646 (patch) | |
| tree | e74b164480a0627182d63ccd8fd2facf790791b6 | |
| parent | fd24ae76ac016b1a6d4f81d47485e2f8d8ee17f2 (diff) | |
| parent | e12d53601aa45c4624dd9f8ff8f4c40e58ca7b84 (diff) | |
| download | rabbitmq-server-git-844ecd7146f5c38eb9b896c4837eb118068fc646.tar.gz | |
Merging bug24067 to default
| -rw-r--r-- | src/rabbit_tests.erl | 2 | ||||
| -rw-r--r-- | src/test_sup.erl | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 524e8e6edd..6cb0dbf471 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -1553,7 +1553,7 @@ test_logs_working(MainLogFile, SaslLogFile) -> ok = rabbit_log:error("foo bar"), ok = error_logger:error_report(crash_report, [foo, bar]), %% give the error loggers some time to catch up - timer:sleep(50), + timer:sleep(100), [true, true] = non_empty_files([MainLogFile, SaslLogFile]), ok. diff --git a/src/test_sup.erl b/src/test_sup.erl index 150235da9b..84c4121c9a 100644 --- a/src/test_sup.erl +++ b/src/test_sup.erl @@ -33,10 +33,10 @@ test_supervisor_delayed_restart() -> test_supervisor_delayed_restart(SupPid) -> ok = ping_child(SupPid), ok = exit_child(SupPid), - timer:sleep(10), + timer:sleep(100), ok = ping_child(SupPid), ok = exit_child(SupPid), - timer:sleep(10), + timer:sleep(100), timeout = ping_child(SupPid), timer:sleep(1010), ok = ping_child(SupPid), |