svn commit: r1404922 - in /camel/branches/camel-2.10.x: ./ components/camel-ftp/pom.xml components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java

[davsclaus]

Author: davsclaus
Date: Fri Nov  2 11:15:34 2012
New Revision: 1404922

URL: http://svn.apache.org/viewvc?rev=1404922&view=rev
Log:
Skipt tests that may hang CI servers

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-ftp/pom.xml
    
camel/branches/camel-2.10.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java

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

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

Modified: camel/branches/camel-2.10.x/components/camel-ftp/pom.xml
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-ftp/pom.xml?rev=1404922&r1=1404921&r2=1404922&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-ftp/pom.xml (original)
+++ camel/branches/camel-2.10.x/components/camel-ftp/pom.xml Fri Nov  2 
11:15:34 2012
@@ -118,6 +118,7 @@
 
   <build>
     <plugins>
+
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>
         <configuration>
@@ -128,6 +129,18 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
+
+      <!-- skip sftp tests as they can hang CI servers -->
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <excludes>
+            
<exclude>org/apache/camel/component/file/remote/sftp/**.java</exclude>
+          </excludes>
+        </configuration>
+      </plugin>
+
     </plugins>
   </build>
 

Modified: 
camel/branches/camel-2.10.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java?rev=1404922&r1=1404921&r2=1404922&view=diff
==============================================================================
--- 
camel/branches/camel-2.10.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java
 (original)
+++ 
camel/branches/camel-2.10.x/components/camel-hawtdb/src/test/java/org/apache/camel/component/hawtdb/HawtDBAggregateTimeoutCompletionRestartTest.java
 Fri Nov  2 11:15:34 2012
@@ -21,6 +21,7 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
 import org.junit.Test;
 
 public class HawtDBAggregateTimeoutCompletionRestartTest extends 
CamelTestSupport {
@@ -32,6 +33,7 @@ public class HawtDBAggregateTimeoutCompl
     }
 
     @Test
+    @Ignore("Can hang CI servers")
     public void testHawtDBAggregateTimeoutCompletionRestart() throws Exception 
{
         MockEndpoint mock = getMockEndpoint("mock:aggregated");
         mock.expectedMessageCount(0);