This is an automated email from the ASF dual-hosted git repository.
mpetrov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 9ef9716a6fb IGNITE-27922 Fix broken
GridCachePartitionedMultiJvmFullApiSelfTest (#12777)
9ef9716a6fb is described below
commit 9ef9716a6fbec771e31ee4e79d1fe83ee5ba2283
Author: Mikhail Petrov <[email protected]>
AuthorDate: Fri Feb 20 15:48:39 2026 +0300
IGNITE-27922 Fix broken GridCachePartitionedMultiJvmFullApiSelfTest (#12777)
---
.../cache/GridCacheAbstractFullApiSelfTest.java | 2 ++
.../ignite/testframework/junits/GridAbstractTest.java | 4 ++--
.../spi/discovery/zk/ZookeeperDiscoverySpi.java | 17 -----------------
.../zk/ZookeeperDiscoverySpiTestConfigurator.java | 19 +++++++++++++++++++
4 files changed, 23 insertions(+), 19 deletions(-)
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
index a15108cfbc4..11ad252160c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
@@ -96,6 +96,7 @@ import org.apache.ignite.resources.ServiceResource;
import org.apache.ignite.services.Service;
import org.apache.ignite.services.ServiceContext;
import org.apache.ignite.testframework.GridTestUtils;
+import org.apache.ignite.testframework.junits.WithSystemProperty;
import org.apache.ignite.transactions.Transaction;
import org.apache.ignite.transactions.TransactionConcurrency;
import org.apache.ignite.transactions.TransactionIsolation;
@@ -126,6 +127,7 @@ import static
org.apache.ignite.transactions.TransactionState.COMMITTED;
* Full API cache test.
*/
@SuppressWarnings("TransientFieldInNonSerializableClass")
+@WithSystemProperty(key = "h2.check", value = "false")
public abstract class GridCacheAbstractFullApiSelfTest extends
GridCacheAbstractSelfTest {
/** Test timeout */
private static final long TEST_TIMEOUT = 60 * 1000;
diff --git
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
index 0a4bce9e44a..039309f8663 100755
---
a/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/testframework/junits/GridAbstractTest.java
@@ -1474,8 +1474,8 @@ public abstract class GridAbstractTest extends
JUnitAssertAware {
resetDiscovery = false;
}
- catch (NoSuchMethodException ignore) {
- // Ignore.
+ catch (NoSuchMethodException e) {
+ log.warning("Failed to clone Discovery SPI.
cloneSpiConfiguration method was not found", e);
}
}
}
diff --git
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
index c439dce3708..54347b18970 100644
---
a/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
+++
b/modules/zookeeper/src/main/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpi.java
@@ -552,23 +552,6 @@ public class ZookeeperDiscoverySpi extends
IgniteSpiAdapter implements IgniteDis
return locNode;
}
- /**
- * Used in tests (called via reflection).
- *
- * @return Copy of SPI.
- */
- private ZookeeperDiscoverySpi cloneSpiConfiguration() {
- ZookeeperDiscoverySpi spi = new ZookeeperDiscoverySpi();
-
- spi.setZkRootPath(zkRootPath);
- spi.setZkConnectionString(zkConnectionString);
- spi.setSessionTimeout(sesTimeout);
- spi.setJoinTimeout(joinTimeout);
- spi.setClientReconnectDisabled(clientReconnectDisabled);
-
- return spi;
- }
-
/** {@inheritDoc} */
@Override public String toString() {
return S.toString(ZookeeperDiscoverySpi.class, this);
diff --git
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java
index 8a2f4e6c84c..66873187c09 100644
---
a/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java
+++
b/modules/zookeeper/src/test/java/org/apache/ignite/spi/discovery/zk/ZookeeperDiscoverySpiTestConfigurator.java
@@ -28,6 +28,7 @@ import
org.apache.ignite.spi.discovery.DiscoverySpiCustomMessage;
import
org.apache.ignite.spi.discovery.tcp.IgniteDiscoverySpiInternalListenerSupport;
import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi;
import org.apache.ignite.testframework.config.GridTestProperties;
+import org.apache.ignite.testframework.junits.GridAbstractTest;
/**
* Allows to run regular Ignite tests with {@link
org.apache.ignite.spi.discovery.zk.ZookeeperDiscoverySpi}.
@@ -117,5 +118,23 @@ public class ZookeeperDiscoverySpiTestConfigurator {
@Override public void
setInternalListener(IgniteDiscoverySpiInternalListener lsnr) {
internalLsnr = lsnr;
}
+
+ /**
+ * Creates copy of current SPI instance. Is called by test framework
using reflection
+ * (see {@link GridAbstractTest#startRemoteGrid}).
+ *
+ * @return Copy of current SPI instance.
+ */
+ public ZookeeperDiscoverySpi cloneSpiConfiguration() {
+ ZookeeperDiscoverySpi spi = new TestZookeeperDiscoverySpi();
+
+ spi.setZkRootPath(getZkRootPath());
+ spi.setZkConnectionString(getZkConnectionString());
+ spi.setSessionTimeout(getSessionTimeout());
+ spi.setJoinTimeout(getJoinTimeout());
+ spi.setClientReconnectDisabled(isClientReconnectDisabled());
+
+ return spi;
+ }
}
}
