[05/50] [abbrv] ignite git commit: IGNITE-9498 SchemaExchangeSelfTest should use declared test IP finder - Fixes #4694.

2018-09-13 Thread dpavlov 
IGNITE-9498 SchemaExchangeSelfTest should use declared test IP finder - Fixes 
#4694.


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

Branch: refs/heads/ignite-9349
Commit: da6e7319fd4a85b7a512e798f4a075fcbb3854a3
Parents: 00e935d
Author: Alexey Goncharuk 
Authored: Fri Sep 7 16:57:05 2018 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 7 17:03:48 2018 +0300

--
 .../processors/cache/index/SchemaExchangeSelfTest.java   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/da6e7319/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
index b92c792..c7709f2 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 
 import java.util.Collections;
@@ -47,6 +48,9 @@ public class SchemaExchangeSelfTest extends 
AbstractSchemaSelfTest {
 /** Node on which filter should be applied (if any). */
 private static String filterNodeName;
 
+/** */
+private static final TcpDiscoveryVmIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
+
 /** {@inheritDoc} */
 @Override protected void afterTest() throws Exception {
 stopAllGrids();
@@ -541,7 +545,7 @@ public class SchemaExchangeSelfTest extends 
AbstractSchemaSelfTest {
 
 cfg.setClientMode(client);
 cfg.setLocalHost("127.0.0.1");
-cfg.setDiscoverySpi(new TestTcpDiscoverySpi());
+cfg.setDiscoverySpi(new TestTcpDiscoverySpi().setIpFinder(IP_FINDER));
 
 if (filterNodeName != null && F.eq(name, filterNodeName))
 cfg.setUserAttributes(Collections.singletonMap("AFF_NODE", true));
@@ -591,7 +595,7 @@ public class SchemaExchangeSelfTest extends 
AbstractSchemaSelfTest {
 cfg.setClientMode(client);
 cfg.setLocalHost("127.0.0.1");
 
-cfg.setDiscoverySpi(new TestTcpDiscoverySpi());
+cfg.setDiscoverySpi(new TestTcpDiscoverySpi().setIpFinder(IP_FINDER));
 
 return (IgniteEx)Ignition.start(cfg);
 }

ignite git commit: IGNITE-9498 SchemaExchangeSelfTest should use declared test IP finder - Fixes #4694.

2018-09-07 Thread agoncharuk 
Repository: ignite
Updated Branches:
  refs/heads/master 00e935d33 -> da6e7319f


IGNITE-9498 SchemaExchangeSelfTest should use declared test IP finder - Fixes 
#4694.


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

Branch: refs/heads/master
Commit: da6e7319fd4a85b7a512e798f4a075fcbb3854a3
Parents: 00e935d
Author: Alexey Goncharuk 
Authored: Fri Sep 7 16:57:05 2018 +0300
Committer: Alexey Goncharuk 
Committed: Fri Sep 7 17:03:48 2018 +0300

--
 .../processors/cache/index/SchemaExchangeSelfTest.java   | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/ignite/blob/da6e7319/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
--
diff --git 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
index b92c792..c7709f2 100644
--- 
a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
+++ 
b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/SchemaExchangeSelfTest.java
@@ -32,6 +32,7 @@ import org.apache.ignite.internal.util.lang.GridAbsPredicate;
 import org.apache.ignite.internal.util.typedef.F;
 import org.apache.ignite.lang.IgniteFuture;
 import org.apache.ignite.lang.IgnitePredicate;
+import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder;
 import org.apache.ignite.testframework.GridTestUtils;
 
 import java.util.Collections;
@@ -47,6 +48,9 @@ public class SchemaExchangeSelfTest extends 
AbstractSchemaSelfTest {
 /** Node on which filter should be applied (if any). */
 private static String filterNodeName;
 
+/** */
+private static final TcpDiscoveryVmIpFinder IP_FINDER = new 
TcpDiscoveryVmIpFinder(true);
+
 /** {@inheritDoc} */
 @Override protected void afterTest() throws Exception {
 stopAllGrids();
@@ -541,7 +545,7 @@ public class SchemaExchangeSelfTest extends 
AbstractSchemaSelfTest {
 
 cfg.setClientMode(client);
 cfg.setLocalHost("127.0.0.1");
-cfg.setDiscoverySpi(new TestTcpDiscoverySpi());
+cfg.setDiscoverySpi(new TestTcpDiscoverySpi().setIpFinder(IP_FINDER));
 
 if (filterNodeName != null && F.eq(name, filterNodeName))
 cfg.setUserAttributes(Collections.singletonMap("AFF_NODE", true));
@@ -591,7 +595,7 @@ public class SchemaExchangeSelfTest extends 
AbstractSchemaSelfTest {
 cfg.setClientMode(client);
 cfg.setLocalHost("127.0.0.1");
 
-cfg.setDiscoverySpi(new TestTcpDiscoverySpi());
+cfg.setDiscoverySpi(new TestTcpDiscoverySpi().setIpFinder(IP_FINDER));
 
 return (IgniteEx)Ignition.start(cfg);
 }