Skip to content

Commit 9ef9716

Browse files
authored
IGNITE-27922 Fix broken GridCachePartitionedMultiJvmFullApiSelfTest (#12777)
1 parent 41be30a commit 9ef9716

File tree

4 files changed

+23
-19
lines changed

4 files changed

+23
-19
lines changed

modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
import org.apache.ignite.services.Service;
9797
import org.apache.ignite.services.ServiceContext;
9898
import org.apache.ignite.testframework.GridTestUtils;
99+
import org.apache.ignite.testframework.junits.WithSystemProperty;
99100
import org.apache.ignite.transactions.Transaction;
100101
import org.apache.ignite.transactions.TransactionConcurrency;
101102
import org.apache.ignite.transactions.TransactionIsolation;
@@ -126,6 +127,7 @@
126127
* Full API cache test.
127128
*/
128129
@SuppressWarnings("TransientFieldInNonSerializableClass")
130+
@WithSystemProperty(key = "h2.check", value = "false")
129131
public abstract class GridCacheAbstractFullApiSelfTest extends GridCacheAbstractSelfTest {
130132
/** Test timeout */
131133
private static final long TEST_TIMEOUT = 60 * 1000;

modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,8 +1474,8 @@ protected Ignite startRemoteGrid(
14741474

14751475
resetDiscovery = false;
14761476
}
1477-
catch (NoSuchMethodException ignore) {
1478-
// Ignore.
1477+
catch (NoSuchMethodException e) {
1478+
log.warning("Failed to clone Discovery SPI. cloneSpiConfiguration method was not found", e);
14791479
}
14801480
}
14811481
}

modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -552,23 +552,6 @@ private ZookeeperClusterNode initLocalNode() {
552552
return locNode;
553553
}
554554

555-
/**
556-
* Used in tests (called via reflection).
557-
*
558-
* @return Copy of SPI.
559-
*/
560-
private ZookeeperDiscoverySpi cloneSpiConfiguration() {
561-
ZookeeperDiscoverySpi spi = new ZookeeperDiscoverySpi();
562-
563-
spi.setZkRootPath(zkRootPath);
564-
spi.setZkConnectionString(zkConnectionString);
565-
spi.setSessionTimeout(sesTimeout);
566-
spi.setJoinTimeout(joinTimeout);
567-
spi.setClientReconnectDisabled(clientReconnectDisabled);
568-
569-
return spi;
570-
}
571-
572555
/** {@inheritDoc} */
573556
@Override public String toString() {
574557
return S.toString(ZookeeperDiscoverySpi.class, this);

modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.apache.ignite.spi.discovery.tcp.IgniteDiscoverySpiInternalListenerSupport;
2929
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
3030
import org.apache.ignite.testframework.config.GridTestProperties;
31+
import org.apache.ignite.testframework.junits.GridAbstractTest;
3132

3233
/**
3334
* Allows to run regular Ignite tests with {@link org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi}.
@@ -117,5 +118,23 @@ private static class TestZookeeperDiscoverySpi extends ZookeeperDiscoverySpi imp
117118
@Override public void setInternalListener(IgniteDiscoverySpiInternalListener lsnr) {
118119
internalLsnr = lsnr;
119120
}
121+
122+
/**
123+
* Creates copy of current SPI instance. Is called by test framework using reflection
124+
* (see {@link GridAbstractTest#startRemoteGrid}).
125+
*
126+
* @return Copy of current SPI instance.
127+
*/
128+
public ZookeeperDiscoverySpi cloneSpiConfiguration() {
129+
ZookeeperDiscoverySpi spi = new TestZookeeperDiscoverySpi();
130+
131+
spi.setZkRootPath(getZkRootPath());
132+
spi.setZkConnectionString(getZkConnectionString());
133+
spi.setSessionTimeout(getSessionTimeout());
134+
spi.setJoinTimeout(getJoinTimeout());
135+
spi.setClientReconnectDisabled(isClientReconnectDisabled());
136+
137+
return spi;
138+
}
120139
}
121140
}

0 commit comments

Comments
 (0)