You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/09/08 08:48:11 UTC
ignite git commit: ignite-971 Fixed test
Repository: ignite
Updated Branches:
refs/heads/ignite-971-1 ccb3f3619 -> 6c66fd7e7
ignite-971 Fixed test
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6c66fd7e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6c66fd7e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6c66fd7e
Branch: refs/heads/ignite-971-1
Commit: 6c66fd7e7f1629eeb1ddb3274d32a08ebe69f383
Parents: ccb3f36
Author: sboikov <sb...@gridgain.com>
Authored: Tue Sep 8 09:48:02 2015 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Tue Sep 8 09:48:02 2015 +0300
----------------------------------------------------------------------
.../processors/cache/CacheAffinityCallSelfTest.java | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6c66fd7e/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 c25bc7c..b9ff46c 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
@@ -21,15 +21,13 @@ import java.util.concurrent.Callable;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteCompute;
-import org.apache.ignite.cluster.ClusterGroupEmptyException;
import org.apache.ignite.cluster.ClusterNode;
-import org.apache.ignite.compute.ComputeTaskCancelledException;
+import org.apache.ignite.cluster.ClusterTopologyException;
import org.apache.ignite.configuration.CacheConfiguration;
import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.IgniteKernal;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
-import org.apache.ignite.internal.processors.affinity.GridAffinityProcessor;
import org.apache.ignite.internal.util.typedef.internal.U;
import org.apache.ignite.lang.IgniteCallable;
import org.apache.ignite.lang.IgniteRunnable;
@@ -147,7 +145,7 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
final IgniteInternalFuture<Object> fut = GridTestUtils.runAsync(new Callable<Object>() {
@Override public Object call() throws Exception {
for (int i = 0; i < SERVERS_COUNT; ++i)
- stopGrid(i);
+ stopGrid(i, false);
return null;
}
@@ -157,14 +155,12 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest {
while (!fut.isDone())
client.compute().affinityCall(CACHE_NAME, key, new CheckCallable(key));
}
- catch (ComputeTaskCancelledException e) {
- assertTrue("Unexpected error: " + e, e.getMessage().contains("stopping"));
+ catch (ClusterTopologyException ignore) {
+ log.info("Expected error: " + ignore);
}
- catch(ClusterGroupEmptyException e) {
- assertTrue("Unexpected error: " + e, e.getMessage().contains("Topology projection is empty"));
+ finally {
+ stopAllGrids();
}
-
- stopAllGrids();
}
/**