Author: markt
Date: Tue Sep 4 20:03:20 2018
New Revision: 1840059
URL: http://svn.apache.org/viewvc?rev=1840059&view=rev
Log:
Fix Windows reporting files cannot be deleted when unit tests complete
Modified:
tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
Modified: tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java?rev=1840059&r1=1840058&r2=1840059&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java
(original)
+++ tomcat/trunk/test/org/apache/catalina/startup/LoggingBaseTest.java Tue Sep
4 20:03:20 2018
@@ -51,6 +51,8 @@ import org.apache.juli.logging.LogFactor
*/
public abstract class LoggingBaseTest {
+ private static List<File> deleteOnClassTearDown = new ArrayList<>();
+
protected Log log;
private File tempDir;
@@ -134,7 +136,8 @@ public abstract class LoggingBaseTest {
}
deleteOnTearDown.clear();
- ExpandWar.deleteDir(tempDir);
+ // tempDir contains log files which will be open until JULI shuts down
+ deleteOnClassTearDown.add(tempDir);
}
@AfterClass
@@ -145,5 +148,9 @@ public abstract class LoggingBaseTest {
} else {
logManager.reset();
}
+ for (File file : deleteOnClassTearDown) {
+ ExpandWar.delete(file);
+ }
+ deleteOnClassTearDown.clear();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
