ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [1/3] incubator-ignite git commit: # IGNITE-709 Fix tests: addtimeout for discoLatch.await()
Date Fri, 15 May 2015 16:37:12 GMT
Repository: incubator-ignite
Updated Branches:
  refs/heads/ignite-709_3 ac72c09a4 -> ce5eb8bd2


# IGNITE-709 Fix tests: addtimeout for discoLatch.await()


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

Branch: refs/heads/ignite-709_3
Commit: 99863017d712a5b1a16e93478637180e9e7061ae
Parents: 2d90db7
Author: sevdokimov <sevdokimov@gridgain.com>
Authored: Fri May 15 18:08:18 2015 +0300
Committer: sevdokimov <sevdokimov@gridgain.com>
Committed: Fri May 15 18:08:18 2015 +0300

----------------------------------------------------------------------
 .../cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java      | 2 +-
 .../internal/processors/continuous/GridEventConsumeSelfTest.java | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99863017/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
index 9250361..72fa72e 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTcpClientDiscoveryMultiThreadedTest.java
@@ -97,7 +97,7 @@ public class GridCacheTcpClientDiscoveryMultiThreadedTest extends GridCacheAbstr
 
     /** {@inheritDoc} */
     @Override protected long getTestTimeout() {
-        return 60 * 1000;
+        return 2 * 60 * 1000;
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/99863017/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
index bca784b..7a9bd3a 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/GridEventConsumeSelfTest.java
@@ -871,7 +871,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
 
         stopGrid("anotherGrid");
 
-        latch.await();
+        assert latch.await(3000, MILLISECONDS);
     }
 
     /**
@@ -917,7 +917,7 @@ public class GridEventConsumeSelfTest extends GridCommonAbstractTest implements
 
         stopGrid("anotherGrid");
 
-        discoLatch.await();
+        discoLatch.await(3000, MILLISECONDS);
 
         grid(0).compute().broadcast(F.noop());
 


Mime
View raw message