diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2015-10-05 00:26:27 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2015-10-05 00:26:27 +0300 |
| commit | cba94b12742f436ddf423c432a2fb429961909bf (patch) | |
| tree | e63f138754e61b0ef9e903e4a1a0d6f115fc61be /test/src | |
| parent | a4ff2a86cfd926530760ef3e47000bc55e42e213 (diff) | |
| parent | e09b99351721b7498f8fe0afc2fbae76aa6840ef (diff) | |
| download | rabbitmq-server-git-cba94b12742f436ddf423c432a2fb429961909bf.tar.gz | |
Merge branch 'stable'
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 57e250637d..c056c280fa 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() -> |