IGNITE-6082 Fixed DynamicIndexPartitionedTransactionalConcurrentSelfTest.testConcurrentPutRemove (use correct IP finder in test SPI)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/df2fb8c5 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/df2fb8c5 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/df2fb8c5 Branch: refs/heads/ignite-5578 Commit: df2fb8c5988854504c681c4493c1a773d1e61458 Parents: 2506ae5 Author: Dmitriy Govorukhin <[email protected]> Authored: Wed Aug 16 17:01:57 2017 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Aug 16 17:01:57 2017 +0300 ---------------------------------------------------------------------- .../index/DynamicIndexAbstractConcurrentSelfTest.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/df2fb8c5/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java index 913d724..00fd413 100644 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/index/DynamicIndexAbstractConcurrentSelfTest.java @@ -49,6 +49,7 @@ import org.apache.ignite.internal.processors.query.h2.IgniteH2Indexing; import org.apache.ignite.internal.processors.query.schema.SchemaIndexCacheVisitor; import org.apache.ignite.internal.processors.query.schema.SchemaOperationException; import org.apache.ignite.internal.util.typedef.T3; +import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.jetbrains.annotations.NotNull; import static org.apache.ignite.internal.IgniteClientReconnectAbstractTest.TestTcpDiscoverySpi; @@ -120,7 +121,15 @@ public abstract class DynamicIndexAbstractConcurrentSelfTest extends DynamicInde /** {@inheritDoc} */ @Override protected IgniteConfiguration commonConfiguration(int idx) throws Exception { - return super.commonConfiguration(idx).setDiscoverySpi(new TestTcpDiscoverySpi()); + IgniteConfiguration cfg = super.commonConfiguration(idx); + + TestTcpDiscoverySpi testSpi = new TestTcpDiscoverySpi(); + + if (cfg.getDiscoverySpi() instanceof TcpDiscoverySpi && + ((TcpDiscoverySpi)cfg.getDiscoverySpi()).getIpFinder() != null) + testSpi.setIpFinder(((TcpDiscoverySpi)cfg.getDiscoverySpi()).getIpFinder()); + + return cfg.setDiscoverySpi(testSpi); } /**
