diff options
| author | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-05 00:28:12 +0200 |
|---|---|---|
| committer | Alvaro Videla <videlalvaro@gmail.com> | 2015-10-05 00:28:12 +0200 |
| commit | e0bb5df5b5ee83e6542df4471ffe3dfd695deb04 (patch) | |
| tree | f474157cc9892fd3fdbca7f041fa998ed5340f3b /test/src | |
| parent | 7f27f432c2ac97a7cc12b57d652a522d4b9293cf (diff) | |
| parent | cba94b12742f436ddf423c432a2fb429961909bf (diff) | |
| download | rabbitmq-server-git-e0bb5df5b5ee83e6542df4471ffe3dfd695deb04.tar.gz | |
Merge branch 'master' into rabbitmq-server-336
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/rabbit_tests.erl | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl index 36e6aa920d..7fbfea2a4b 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -1914,9 +1914,19 @@ add_log_handlers(Handlers) -> {Handler, Args} <- Handlers], ok. +%% sasl_report_file_h returns [] during terminate +%% see: https://github.com/erlang/otp/blob/maint/lib/stdlib/src/error_logger_file_h.erl#L98 +%% +%% error_logger_file_h returns ok since OTP 18.1 +%% see: https://github.com/erlang/otp/blob/maint/lib/stdlib/src/error_logger_file_h.erl#L98 delete_log_handlers(Handlers) -> - [[] = error_logger:delete_report_handler(Handler) || - Handler <- Handlers], + [ok_or_empty_list(error_logger:delete_report_handler(Handler)) + || Handler <- Handlers], + ok. + +ok_or_empty_list([]) -> + []; +ok_or_empty_list(ok) -> ok. test_supervisor_delayed_restart() -> |