[ignite-3] branch main updated: IGNITE-18402 ItLogicalTopologyTest.receivesLogicalTopologyEventsCausedByNodeRestart fails locally (#1450)

[ibessonov]

This is an automated email from the ASF dual-hosted git repository.

ibessonov pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/ignite-3.git


The following commit(s) were added to refs/heads/main by this push:
     new ec3b2a477a IGNITE-18402 
ItLogicalTopologyTest.receivesLogicalTopologyEventsCausedByNodeRestart fails 
locally (#1450)
ec3b2a477a is described below

commit ec3b2a477a9ce2de8549c1f88c49aa6d30eb7390
Author: Roman Puchkovskiy <roman.puchkovs...@gmail.com>
AuthorDate: Wed Dec 14 18:42:36 2022 +0400

    IGNITE-18402 
ItLogicalTopologyTest.receivesLogicalTopologyEventsCausedByNodeRestart fails 
locally (#1450)
---
 .../ignite/internal/AbstractClusterIntegrationTest.java    |  2 --
 .../ignite/internal/compute/ItLogicalTopologyTest.java     | 14 ++++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git 
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/AbstractClusterIntegrationTest.java
 
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/AbstractClusterIntegrationTest.java
index 10fe272c58..7a5dd7035d 100644
--- 
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/AbstractClusterIntegrationTest.java
+++ 
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/AbstractClusterIntegrationTest.java
@@ -46,7 +46,6 @@ import org.apache.ignite.lang.IgniteStringFormatter;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.TestInfo;
-import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.extension.ExtendWith;
 
 /**
@@ -54,7 +53,6 @@ import org.junit.jupiter.api.extension.ExtendWith;
  */
 @SuppressWarnings("ALL")
 @ExtendWith(WorkDirectoryExtension.class)
-@TestInstance(TestInstance.Lifecycle.PER_CLASS)
 public abstract class AbstractClusterIntegrationTest extends 
BaseIgniteAbstractTest {
     private static final IgniteLogger LOG = 
Loggers.forClass(AbstractClusterIntegrationTest.class);
 
diff --git 
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java
 
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java
index e048855e30..8de3186259 100644
--- 
a/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java
+++ 
b/modules/runner/src/integrationTest/java/org/apache/ignite/internal/compute/ItLogicalTopologyTest.java
@@ -34,6 +34,7 @@ import org.apache.ignite.internal.app.IgniteImpl;
 import 
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologyEventListener;
 import 
org.apache.ignite.internal.cluster.management.topology.api.LogicalTopologySnapshot;
 import org.apache.ignite.internal.network.message.ScaleCubeMessage;
+import org.apache.ignite.internal.tostring.S;
 import org.apache.ignite.network.ClusterNode;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInfo;
@@ -105,17 +106,17 @@ class ItLogicalTopologyTest extends 
AbstractClusterIntegrationTest {
 
         restartNode(1, testInfo);
 
-        assertTrue(waitForCondition(() -> events.size() >= 4, 10_000));
+        waitForCondition(() -> events.size() >= 2, 10_000);
 
-        assertThat(events, hasSize(4));
+        assertThat(events, hasSize(2));
 
-        Event leaveEvent = events.get(2);
+        Event leaveEvent = events.get(0);
 
         assertFalse(leaveEvent.appeared);
         assertThat(leaveEvent.node.name(), is(secondIgnite.name()));
         assertThat(leaveEvent.topologyVersion, is(3L));
 
-        Event joinEvent = events.get(3);
+        Event joinEvent = events.get(1);
 
         assertTrue(joinEvent.appeared);
         assertThat(joinEvent.node.name(), is(secondIgnite.name()));
@@ -175,5 +176,10 @@ class ItLogicalTopologyTest extends 
AbstractClusterIntegrationTest {
             this.node = node;
             this.topologyVersion = topologyVersion;
         }
+
+        @Override
+        public String toString() {
+            return S.toString(this);
+        }
     }
 }