diff options
| author | Michael Klishin <michael@novemberain.com> | 2015-10-05 00:26:10 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@novemberain.com> | 2015-10-05 00:26:10 +0300 |
| commit | e09b99351721b7498f8fe0afc2fbae76aa6840ef (patch) | |
| tree | 984868ced67f8c6e7f0be907c676e360c0b4616e /test | |
| parent | fbaf08d111532a7b413732d2dd89571a0d4298a3 (diff) | |
| parent | 820b709d6d713a37ca0998d620c04a23336ca040 (diff) | |
| download | rabbitmq-server-git-e09b99351721b7498f8fe0afc2fbae76aa6840ef.tar.gz | |
Merge pull request #334 from rabbitmq/rabbitmq-server-324
Fixes log handlers breakage since 18.1
Diffstat (limited to 'test')
| -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 6f0f5eb181..622229b19d 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -1819,9 +1819,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() -> |