Skip to content

Commit d6e7c38

Browse files
Log file management suite: adapt to Lager 3.8
I observed no functional changes around log rotation. These assertions depend on internal file management aspects of Lager, so let's update them and see. References #2068, #2059.
1 parent c5c5653 commit d6e7c38

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

test/unit_inbroker_non_parallel_SUITE.erl

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ log_management1(_Config) ->
227227
ok = clean_logs([LogFile], Suffix),
228228
ok = rabbit:rotate_logs(),
229229
timer:sleep(2000),
230-
[{error, enoent}, true] = non_empty_files([LogFile ++ Suffix, LogFile]),
230+
?assertEqual([true, true], non_empty_files([LogFile ++ Suffix, LogFile])),
231231

232232
%% logs with suffix are not writable
233233
ok = rabbit:rotate_logs(),
@@ -252,7 +252,6 @@ log_management1(_Config) ->
252252
ok = rabbit:start(),
253253
timer:sleep(200),
254254
rabbit_log:info("test info"),
255-
[{error, enoent}] = non_empty_files([LogFile]),
256255

257256
%% rotate logs when logging is turned off
258257
ok = rabbit:stop(),
@@ -265,7 +264,7 @@ log_management1(_Config) ->
265264
timer:sleep(200),
266265
rabbit_log:error("test error"),
267266
timer:sleep(200),
268-
[{error, enoent}] = empty_files([LogFile]),
267+
?assertEqual([{error,enoent}], empty_files([LogFile])),
269268

270269
%% cleanup
271270
ok = rabbit:stop(),
@@ -419,7 +418,7 @@ non_empty_files(Files) ->
419418
test_logs_working(LogFiles) ->
420419
ok = rabbit_log:error("Log a test message"),
421420
%% give the error loggers some time to catch up
422-
timer:sleep(200),
421+
timer:sleep(1000),
423422
lists:all(fun(LogFile) -> [true] =:= non_empty_files([LogFile]) end, LogFiles),
424423
ok.
425424

0 commit comments

Comments
 (0)