ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ntikho...@apache.org
Subject [02/12] incubator-ignite git commit: #master: fix affinityCall tests.
Date Tue, 21 Jul 2015 15:00:21 GMT
#master: fix affinityCall tests.


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

Branch: refs/heads/ignite-323
Commit: 7ae5ce63fa09da0f3b9c25f77090f8091c6455a5
Parents: 3194415
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Mon Jul 20 18:25:35 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Mon Jul 20 18:25:35 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/CacheAffinityCallSelfTest.java     | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ae5ce63/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
index c4436ca..90160e1 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/CacheAffinityCallSelfTest.java
@@ -45,7 +45,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
     private static final String CACHE_NAME = "myCache";
 
     /** */
-    private static final int MAX_FAILOVER_ATTEMPTS = 5;
+    private static final int MAX_FAILOVER_ATTEMPTS = 105;
 
     /** */
     private static final int SERVERS_COUNT = 4;
@@ -81,7 +81,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
     }
 
     /** {@inheritDoc} */
-    @Override protected void afterTest() throws Exception {
+    @Override protected void afterTestsStopped() throws Exception {
         stopAllGrids();
     }
 
@@ -138,10 +138,16 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest
{
             assertTrue(e.getMessage().contains("Topology projection is empty"));
         }
         catch(IgniteException e) {
-            assertTrue(e.getMessage().contains("cache (or node) is stopping"));
+            assertTrue(e.getMessage().contains("Client node disconnected") ||
+                e.getMessage().contains("Failed to reconnect to cluster") ||
+                e.getMessage().contains("Failed to execute task, client node disconnected."));
         }
 
+        startGrid(0);
+
         stopGrid(SERVERS_COUNT);
+
+        stopGrid(0);
     }
 
     /**


Mime
View raw message