Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
  • Loading branch information
IngelaAndin committed Sep 9, 2024
2 parents 3e6c47e + 2283097 commit 8969857
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions lib/kernel/test/logger_env_var_SUITE.erl
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@

-import(logger_test_lib,[setup/2,log/3,sync_and_read/3]).

-define(NO_SASL_PROGRESS_REPORTS, 6).

suite() ->
[{timetrap, {seconds, 60}}].

Expand Down Expand Up @@ -483,7 +485,7 @@ logger_many_handlers_default_first(Config) ->
config=>#{type=>{file,LogInfo}}}
}
]},
{logger_level,info}], LogErr, LogInfo, 6).
{logger_level,info}], LogErr, LogInfo, ?NO_SASL_PROGRESS_REPORTS).

%% Test that we can add multiple handlers with the default last
logger_many_handlers_default_last(Config) ->
Expand All @@ -503,7 +505,7 @@ logger_many_handlers_default_last(Config) ->
config=>#{type=>{file,LogErr}}}
}
]},
{logger_level,info}], LogErr, LogInfo, 7).
{logger_level,info}], LogErr, LogInfo, ?NO_SASL_PROGRESS_REPORTS).

%% Check that we can handle that an added logger has a broken filter
%% This used to cause a deadlock.
Expand All @@ -526,7 +528,7 @@ logger_many_handlers_default_last_broken_filter(Config) ->
config=>#{type=>{file,LogErr}}}
}
]},
{logger_level,info}], LogErr, LogInfo, 7).
{logger_level,info}], LogErr, LogInfo, ?NO_SASL_PROGRESS_REPORTS).

logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
{ok, _, Peer, Node} = setup(Config, Env),
Expand Down

0 comments on commit 8969857

Please sign in to comment.