camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1414572 - in /camel/branches/camel-2.10.x: ./ camel-core/pom.xml components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
Date Wed, 28 Nov 2012 08:36:26 GMT
Author: davsclaus
Date: Wed Nov 28 08:36:25 2012
New Revision: 1414572

URL: http://svn.apache.org/viewvc?rev=1414572&view=rev
Log:
Skip stress file tests as they were intended for manual testing. Though ought to run for a
longer time though

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/camel-core/pom.xml
    camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1414571

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/camel-core/pom.xml
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/pom.xml?rev=1414572&r1=1414571&r2=1414572&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/pom.xml (original)
+++ camel/branches/camel-2.10.x/camel-core/pom.xml Wed Nov 28 08:36:25 2012
@@ -156,12 +156,11 @@
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
-          <forkMode>once</forkMode>
-          <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
+          <!-- skip file stress tests as they are intended to run manually -->
           <excludes>
-            <!-- TODO FIXME ASAP -->
-            <exclude>**/XXXTest.*</exclude>            
+            <exclude>org/apache/camel/component/file/stress/**.java</exclude>
           </excludes>
+          <forkedProcessTimeoutInSeconds>3000</forkedProcessTimeoutInSeconds>
         </configuration>
       </plugin>
 

Modified: camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java?rev=1414572&r1=1414571&r2=1414572&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
(original)
+++ camel/branches/camel-2.10.x/components/camel-zookeeper/src/test/java/org/apache/camel/component/zookeeper/ZooKeeperTestSupport.java
Wed Nov 28 08:36:25 2012
@@ -304,8 +304,11 @@ public class ZooKeeperTestSupport extend
         File f = deleteStack.pollLast();
         if (f != null) {
             if (f.isDirectory()) {
-                for (File child : f.listFiles()) {
-                    deleteStack.addLast(child);
+                File[] files = f.listFiles();
+                if (files != null) {
+                    for (File child : files) {
+                        deleteStack.addLast(child);
+                    }
                 }
             }
             deleteDir(deleteStack);



Mime
View raw message