svn commit: r942409 - /tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

[markt]

Author: markt
Date: Sat May  8 16:01:16 2010
New Revision: 942409

URL: http://svn.apache.org/viewvc?rev=942409&view=rev
Log:
Stop the tests failing

Modified:
    tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java

Modified: tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java?rev=942409&r1=942408&r2=942409&view=diff
==============================================================================
--- tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java (original)
+++ tomcat/trunk/test/org/apache/catalina/startup/TomcatBaseTest.java Sat May  
8 16:01:16 2010
@@ -84,12 +84,12 @@ public abstract class TomcatBaseTest ext
                 "org.apache.juli.ClassLoaderLogManager");
 
         tempDir = new File(System.getProperty("tomcat.test.temp", 
"output/tmp"));
-        if (!tempDir.mkdir()) {
+        if (!tempDir.exists() && !tempDir.mkdir()) {
             fail("Unable to create temporary directory for test");
         }
         
         File appBase = new File(tempDir, "webapps");
-        if (!appBase.mkdir()) {
+        if (!appBase.exists() && !appBase.mkdir()) {
             fail("Unable to create appBase for test");
         }
         



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org