Repository: ignite Updated Branches: refs/heads/ignite-4154 0832d6880 -> d5465c753
ignite-4154 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d5465c75 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d5465c75 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d5465c75 Branch: refs/heads/ignite-4154 Commit: d5465c753327ca5b0b1b091ba992ba454c96b1ed Parents: 0832d68 Author: sboikov <[email protected]> Authored: Thu Nov 10 18:26:07 2016 +0300 Committer: sboikov <[email protected]> Committed: Thu Nov 10 18:26:07 2016 +0300 ---------------------------------------------------------------------- .../continuous/IgniteNoCustomEventsOnNodeStart.java | 7 +++++++ .../junits/common/GridCommonAbstractTest.java | 13 +++++++++++++ 2 files changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/d5465c75/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java index 5ecc27a..1259faf 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/continuous/IgniteNoCustomEventsOnNodeStart.java @@ -68,6 +68,13 @@ public class IgniteNoCustomEventsOnNodeStart extends GridCommonAbstractTest { assertFalse(failed); } + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + + super.afterTest(); + } + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/d5465c75/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java index 87509a4..5455089 100644 --- a/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/testframework/junits/common/GridCommonAbstractTest.java @@ -440,9 +440,22 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { protected void awaitPartitionMapExchange(boolean waitEvicts, boolean waitNode2PartUpdate) throws InterruptedException { long timeout = 30_000; + long startTime = -1; + + Set<String> names = new HashSet<>(); + for (Ignite g : G.allGrids()) { IgniteKernal g0 = (IgniteKernal)g; + names.add(g0.configuration().getGridName()); + + if (startTime != -1) { + if (startTime != g0.context().discovery().gridStartTime()) + fail("Found nodes from different clusters [allNodes=" + names + ']'); + } + else + startTime = g0.context().discovery().gridStartTime(); + for (IgniteCacheProxy<?, ?> c : g0.context().cache().jcaches()) { CacheConfiguration cfg = c.context().config();
