diff options
Diffstat (limited to 'test/src')
| -rw-r--r-- | test/src/rabbit_tests.erl | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/test/src/rabbit_tests.erl b/test/src/rabbit_tests.erl index 6f0f5eb181..0a3340e856 100644 --- a/test/src/rabbit_tests.erl +++ b/test/src/rabbit_tests.erl @@ -1819,11 +1819,27 @@ 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], + [assert_delete_report_handler(Handler) || Handler <- Handlers], ok. +assert_delete_report_handler(rabbit_error_logger_file_h = Handler) -> + Ret = + case list_to_float(rabbit_misc:otp_release()) of + OtpVersion when OtpVersion > 18.0 -> + ok; + _ -> + [] + end, + Ret = error_logger:delete_report_handler(Handler); +assert_delete_report_handler(Handler) -> + [] = error_logger:delete_report_handler(Handler). + test_supervisor_delayed_restart() -> test_sup:test_supervisor_delayed_restart(). |