Repository: ignite Updated Branches: refs/heads/ignite-4154 4608a30b6 -> 5a0a9f469
ignite-4154 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5a0a9f46 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5a0a9f46 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5a0a9f46 Branch: refs/heads/ignite-4154 Commit: 5a0a9f46959ca5bca411e46ebbab3d19b9dd2adc Parents: 4608a30 Author: sboikov <[email protected]> Authored: Fri Nov 11 10:53:45 2016 +0300 Committer: sboikov <[email protected]> Committed: Fri Nov 11 11:11:30 2016 +0300 ---------------------------------------------------------------------- .../testframework/junits/common/GridCommonAbstractTest.java | 3 ++- .../processors/cache/IgniteCacheOffheapEvictQueryTest.java | 7 +++++++ .../IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java | 7 +++++++ ...iteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java | 7 +++++++ modules/spring/src/test/config/incorrect-store-cache.xml | 2 ++ modules/spring/src/test/config/jdbc-pojo-store-builtin.xml | 3 +++ modules/spring/src/test/config/jdbc-pojo-store-obj.xml | 3 +++ modules/spring/src/test/config/node.xml | 2 ++ modules/spring/src/test/config/node1.xml | 2 ++ modules/spring/src/test/config/pojo-incorrect-store-cache.xml | 2 ++ modules/spring/src/test/config/store-cache.xml | 2 ++ modules/spring/src/test/config/store-cache1.xml | 2 ++ 12 files changed, 41 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/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 5455089..722b460 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 @@ -451,7 +451,8 @@ public abstract class GridCommonAbstractTest extends GridAbstractTest { if (startTime != -1) { if (startTime != g0.context().discovery().gridStartTime()) - fail("Found nodes from different clusters [allNodes=" + names + ']'); + fail("Found nodes from different clusters, probable some test does not stop nodes " + + "[allNodes=" + names + ']'); } else startTime = g0.context().discovery().gridStartTime(); http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java index f21a279..c24fed4 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapEvictQueryTest.java @@ -87,6 +87,13 @@ public class IgniteCacheOffheapEvictQueryTest extends GridCommonAbstractTest { return cfg; } + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + + super.afterTest(); + } + /** * @throws Exception If failed. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java index 5dbb12c..742da7c 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheClientQueryReplicatedNodeRestartSelfTest.java @@ -159,6 +159,13 @@ public class IgniteCacheClientQueryReplicatedNodeRestartSelfTest extends GridCom return c; } + /** {@inheritDoc} */ + @Override protected void afterTest() throws Exception { + stopAllGrids(); + + super.afterTest(); + } + /** * */ http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java index 0f60db2..072a081 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest.java @@ -95,6 +95,13 @@ public class IgniteCacheDistributedQueryStopOnCancelOrTimeoutSelfTest extends Gr g.cache(null).removeAll(); } + /** {@inheritDoc} */ + @Override protected void afterTestsStopped() throws Exception { + stopAllGrids(); + + super.afterTestsStopped(); + } + /** */ public void testRemoteQueryExecutionTimeout() throws Exception { testQuery(CACHE_SIZE, VAL_SIZE, QUERY_1, 500, TimeUnit.MILLISECONDS, true); http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/incorrect-store-cache.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/incorrect-store-cache.xml b/modules/spring/src/test/config/incorrect-store-cache.xml index 2ccda21..b08f84e 100644 --- a/modules/spring/src/test/config/incorrect-store-cache.xml +++ b/modules/spring/src/test/config/incorrect-store-cache.xml @@ -23,6 +23,8 @@ http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml b/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml index d62e76b..dfaf828 100644 --- a/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml +++ b/modules/spring/src/test/config/jdbc-pojo-store-builtin.xml @@ -25,7 +25,10 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> <bean class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="gridName" value="test-cluster"/> + <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/jdbc-pojo-store-obj.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/jdbc-pojo-store-obj.xml b/modules/spring/src/test/config/jdbc-pojo-store-obj.xml index 83e0548..9bc9977 100644 --- a/modules/spring/src/test/config/jdbc-pojo-store-obj.xml +++ b/modules/spring/src/test/config/jdbc-pojo-store-obj.xml @@ -25,7 +25,10 @@ http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd";> <bean class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="gridName" value="test-cluster"/> + <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> <property name="ipFinder"> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/node.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/node.xml b/modules/spring/src/test/config/node.xml index 6f467eb..e6b0b52 100644 --- a/modules/spring/src/test/config/node.xml +++ b/modules/spring/src/test/config/node.xml @@ -25,6 +25,8 @@ <bean id="simpleDataSource" class="org.h2.jdbcx.JdbcDataSource"/> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> <property name="discoverySpi"> <bean class="org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi"> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/node1.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/node1.xml b/modules/spring/src/test/config/node1.xml index 76539f7..814736a 100644 --- a/modules/spring/src/test/config/node1.xml +++ b/modules/spring/src/test/config/node1.xml @@ -25,6 +25,8 @@ <bean id="simpleDataSource" class="org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactorySelfTest$DummyDataSource"/> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="gridName" value="ignite1"/> <!-- Explicitly configure TCP discovery SPI to provide list of initial nodes. --> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/pojo-incorrect-store-cache.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/pojo-incorrect-store-cache.xml b/modules/spring/src/test/config/pojo-incorrect-store-cache.xml index 5627bd0..f7f9141 100644 --- a/modules/spring/src/test/config/pojo-incorrect-store-cache.xml +++ b/modules/spring/src/test/config/pojo-incorrect-store-cache.xml @@ -23,6 +23,8 @@ http://www.springframework.org/schema/beans/spring-beans.xsd";> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/store-cache.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/store-cache.xml b/modules/spring/src/test/config/store-cache.xml index 07a4ab0..d7bc014 100644 --- a/modules/spring/src/test/config/store-cache.xml +++ b/modules/spring/src/test/config/store-cache.xml @@ -25,6 +25,8 @@ <bean id="simpleDataSource" class="org.h2.jdbcx.JdbcDataSource"/> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="cacheConfiguration"> <list> <bean class="org.apache.ignite.configuration.CacheConfiguration"> http://git-wip-us.apache.org/repos/asf/ignite/blob/5a0a9f46/modules/spring/src/test/config/store-cache1.xml ---------------------------------------------------------------------- diff --git a/modules/spring/src/test/config/store-cache1.xml b/modules/spring/src/test/config/store-cache1.xml index a9e58d6..46eef3f 100644 --- a/modules/spring/src/test/config/store-cache1.xml +++ b/modules/spring/src/test/config/store-cache1.xml @@ -26,6 +26,8 @@ <bean id="simpleDataSource1" class="org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactorySelfTest$DummyDataSource"/> <bean id="ignite.cfg" class="org.apache.ignite.configuration.IgniteConfiguration"> + <property name="localHost" value="127.0.0.1"/> + <property name="gridName" value="ignite1"/> <property name="cacheConfiguration">
