#master: fix client 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/9aa928c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9aa928c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9aa928c2 Branch: refs/heads/ignite-961 Commit: 9aa928c2c0e7fc0f88e347a15d8f404864e97ff2 Parents: 79712aa Author: ivasilinets <ivasilin...@gridgain.com> Authored: Tue Jul 21 10:59:11 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Tue Jul 21 10:59:11 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/CacheAffinityCallSelfTest.java | 4 ---- .../org/apache/ignite/testframework/junits/GridAbstractTest.java | 3 ++- 2 files changed, 2 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aa928c2/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 e107c21..befd8c7 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 @@ -143,10 +143,6 @@ public class CacheAffinityCallSelfTest extends GridCommonAbstractTest { e.getMessage().contains("Failed to execute task, client node disconnected.")); } - startGrid(0); - - U.sleep(3000); - stopAllGrids(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9aa928c2/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java index 9a55ccf..d6591cd 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java @@ -753,7 +753,8 @@ public abstract class GridAbstractTest extends TestCase { assert ignite != null : "Ignite returned null grid for name: " + gridName; - info(">>> Stopping grid [name=" + ignite.name() + ", id=" + ignite.cluster().localNode().id() + ']'); + info(">>> Stopping grid [name=" + ignite.name() + ", id=" + + ((IgniteKernal)ignite).context().localNodeId() + ']'); if (!isRemoteJvm(gridName)) G.stop(gridName, cancel);
