Skip to content

fixed undeterministic RollingAppenderDirectCronTest #3946

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: 2.x
Choose a base branch
from
Open

fixed undeterministic RollingAppenderDirectCronTest #3946

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions ...st/java/org/apache/logging/log4j/core/appender/rolling/RollingAppenderDirectCronTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ public RolloverDelay(final RollingFileManager manager) {
}

public void waitForRollover() {
waitAtMost(5, TimeUnit.SECONDS)
waitAtMost(7, TimeUnit.SECONDS)
.alias("Rollover timeout")
.until(() -> latch.getCount() == 0 || assertion != null);
if (assertion != null) {
Expand All @@ -102,16 +102,18 @@ public void rolloverComplete(final String fileName) {
final Path path = Paths.get(fileName);
final Matcher matcher = FILE_PATTERN.matcher(path.getFileName().toString());
assertThat(matcher).as("Rolled file").matches();
try {
final List<String> lines = Files.readAllLines(path);
assertThat(lines).isNotEmpty();
assertThat(lines.get(0)).startsWith(matcher.group(1));
} catch (final IOException ex) {
fail("Unable to read file " + fileName + ": " + ex.getMessage());
}

// Wait until the file is non-empty (or timeout)
waitAtMost(2, TimeUnit.SECONDS).until(() -> Files.exists(path) && Files.size(path) > 0);

final List<String> lines = Files.readAllLines(path);
assertThat(lines).isNotEmpty();
assertThat(lines.get(0)).startsWith(matcher.group(1));
latch.countDown();
} catch (final AssertionError ex) {
assertion = ex;
} catch (final IOException ex) {
fail("Unable to read file " + fileName + ": " + ex.getMessage());
}
}
}
Expand Down