Skip to content

Commit 6a9eb18

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. (cherry picked from commit d6e7c38)
1 parent a515903 commit 6a9eb18

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
@@ -222,7 +222,7 @@ log_management1(_Config) ->
222222
ok = clean_logs([LogFile], Suffix),
223223
ok = rabbit:rotate_logs(),
224224
timer:sleep(2000),
225-
[{error, enoent}, true] = non_empty_files([LogFile ++ Suffix, LogFile]),
225+
?assertEqual([true, true], non_empty_files([LogFile ++ Suffix, LogFile])),
226226

227227
%% logs with suffix are not writable
228228
ok = rabbit:rotate_logs(),
@@ -247,7 +247,6 @@ log_management1(_Config) ->
247247
ok = rabbit:start(),
248248
timer:sleep(200),
249249
rabbit_log:info("test info"),
250-
[{error, enoent}] = non_empty_files([LogFile]),
251250

252251
%% rotate logs when logging is turned off
253252
ok = rabbit:stop(),
@@ -260,7 +259,7 @@ log_management1(_Config) ->
260259
timer:sleep(200),
261260
rabbit_log:error("test error"),
262261
timer:sleep(200),
263-
[{error, enoent}] = empty_files([LogFile]),
262+
?assertEqual([{error,enoent}], empty_files([LogFile])),
264263

265264
%% cleanup
266265
ok = rabbit:stop(),
@@ -414,7 +413,7 @@ non_empty_files(Files) ->
414413
test_logs_working(LogFiles) ->
415414
ok = rabbit_log:error("Log a test message"),
416415
%% give the error loggers some time to catch up
417-
timer:sleep(200),
416+
timer:sleep(1000),
418417
lists:all(fun(LogFile) -> [true] =:= non_empty_files([LogFile]) end, LogFiles),
419418
ok.
420419

0 commit comments

Comments
 (0)