camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject [2/2] git commit: Try to fixed the unit test errors of CI slower box
Date Tue, 03 Sep 2013 01:45:14 GMT
Try to fixed the unit test errors of CI slower box

Conflicts:

	components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java

Conflicts:

	components/camel-zipfile/src/test/java/org/apache/camel/dataformat/zipfile/ZipFileDataFormatTest.java


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/d66ffae1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/d66ffae1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/d66ffae1

Branch: refs/heads/camel-2.10.x
Commit: d66ffae171489c94fb21cc0381e445465993a9ae
Parents: f3cfeca
Author: Willem Jiang <ningjiang@apache.org>
Authored: Tue Sep 3 09:44:20 2013 +0800
Committer: Willem Jiang <ningjiang@apache.org>
Committed: Tue Sep 3 09:44:20 2013 +0800

----------------------------------------------------------------------
 .../apache/camel/processor/jpa/JpaProducerConcurrentTest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/d66ffae1/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
index 48ce655..f206df7 100644
--- a/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
+++ b/components/camel-jpa/src/test/java/org/apache/camel/processor/jpa/JpaProducerConcurrentTest.java
@@ -76,7 +76,7 @@ public class JpaProducerConcurrentTest extends CamelTestSupport {
             responses.put(index, out);
         }
 
-        assertMockEndpointsSatisfied();
+        assertMockEndpointsSatisfied(30, TimeUnit.SECONDS);
 
         assertEquals(files, responses.size());
 
@@ -133,4 +133,4 @@ public class JpaProducerConcurrentTest extends CamelTestSupport {
             }
         });
     }
-}
\ No newline at end of file
+}


Mime
View raw message