You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by ma...@apache.org on 2022/06/18 18:20:36 UTC
[logging-log4j2] 02/02: Only clean up files before tests
This is an automated email from the ASF dual-hosted git repository.
mattsicker pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/logging-log4j2.git
commit d1c265e71498a1c7fa97a8d9e6369d97ec3a19b8
Author: Matt Sicker <ma...@apache.org>
AuthorDate: Sat Jun 18 13:20:14 2022 -0500
Only clean up files before tests
This should hopefully alleviate Windows-specific issues where files are attempted to be deleted while they're in use.
Signed-off-by: Matt Sicker <ma...@apache.org>
---
.../org/apache/logging/log4j/test/junit/AbstractFileCleaner.java | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java
index c6aa8739fc..7a3b2e0405 100644
--- a/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java
+++ b/log4j-api-test/src/main/java/org/apache/logging/log4j/test/junit/AbstractFileCleaner.java
@@ -18,7 +18,6 @@
package org.apache.logging.log4j.test.junit;
import org.apache.commons.io.file.PathUtils;
-import org.junit.jupiter.api.extension.AfterEachCallback;
import org.junit.jupiter.api.extension.BeforeEachCallback;
import org.junit.jupiter.api.extension.ExtensionContext;
@@ -35,7 +34,7 @@ import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.fail;
-abstract class AbstractFileCleaner implements BeforeEachCallback, AfterEachCallback {
+abstract class AbstractFileCleaner implements BeforeEachCallback {
public static final String MAX_TRIES_PROPERTY = "log4j2.junit.fileCleanerMaxTries";
public static final String SLEEP_PERIOD_MILLIS_PROPERTY = "log4j2.junit.fileCleanerSleepPeriodMillis";
@@ -45,11 +44,6 @@ abstract class AbstractFileCleaner implements BeforeEachCallback, AfterEachCallb
clean(context);
}
- @Override
- public void afterEach(final ExtensionContext context) throws Exception {
- clean(context);
- }
-
private void clean(final ExtensionContext context) {
final Collection<Path> paths = getPathsForTest(context);
if (paths.isEmpty()) {