[ignite-3] branch main updated: IGNITE-19155 Use Awaitility instead of waitForCondition (#1897)

[apkhmv]

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

apkhmv 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 e5a61c98da IGNITE-19155 Use Awaitility instead of waitForCondition 
(#1897)
e5a61c98da is described below

commit e5a61c98da02fc97cff9d1eb19ad8712787676b6
Author: Aleksandr Pakhomov <apk...@gmail.com>
AuthorDate: Thu Apr 13 11:52:41 2023 +0400

    IGNITE-19155 Use Awaitility instead of waitForCondition (#1897)
---
 .../ignite/internal/cli/commands/ItClusterCommandTest.java    | 11 +++--------
 .../apache/ignite/internal/cli/commands/ItNodeNameTest.java   |  6 ++----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git 
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItClusterCommandTest.java
 
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItClusterCommandTest.java
index 04ddce8ea3..19c31e7303 100644
--- 
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItClusterCommandTest.java
+++ 
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItClusterCommandTest.java
@@ -23,7 +23,7 @@ import static java.util.stream.Collectors.collectingAndThen;
 import static java.util.stream.Collectors.joining;
 import static java.util.stream.Collectors.toList;
 import static 
org.apache.ignite.internal.testframework.IgniteTestUtils.testNodeName;
-import static 
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
+import static org.awaitility.Awaitility.await;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.allOf;
 import static org.hamcrest.Matchers.is;
@@ -186,7 +186,7 @@ class ItClusterCommandTest extends AbstractCliTest {
                 .map(Matchers::containsString)
                 .collect(collectingAndThen(toList(), (List<Matcher<? super 
String>> matchers) -> allOf(matchers)));
 
-        boolean success = waitForCondition(() -> {
+        await().untilAsserted(() -> {
             out.reset();
             err.reset();
 
@@ -199,13 +199,8 @@ class ItClusterCommandTest extends AbstractCliTest {
                     String.format("Wrong exit code; std is '%s', stderr is 
'%s'", out.toString(UTF_8), err.toString(UTF_8)),
                     code, is(0)
             );
-
-            return nodeNameMatcher.matches(out.toString(UTF_8));
-        }, 10_000);
-
-        if (!success) {
             assertThat(out.toString(UTF_8), nodeNameMatcher);
-        }
+        });
     }
 
     private static class Node {
diff --git 
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
 
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
index b0c84c11b6..ec386d9376 100644
--- 
a/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
+++ 
b/modules/cli/src/integrationTest/java/org/apache/ignite/internal/cli/commands/ItNodeNameTest.java
@@ -17,12 +17,10 @@
 
 package org.apache.ignite.internal.cli.commands;
 
-import static 
org.apache.ignite.internal.testframework.IgniteTestUtils.waitForCondition;
+import static org.awaitility.Awaitility.await;
 import static org.junit.jupiter.api.Assertions.assertAll;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import jakarta.inject.Inject;
-import java.time.Duration;
 import org.apache.ignite.internal.cli.core.repl.registry.NodeNameRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -44,7 +42,7 @@ public class ItNodeNameTest extends 
CliCommandTestInitializedIntegrationBase {
         execute("connect");
         resetOutput();
         // wait to pulling node names
-        assertTrue(waitForCondition(() -> !nodeNameRegistry.names().isEmpty(), 
Duration.ofSeconds(5).toMillis()));
+        await().until(() -> !nodeNameRegistry.names().isEmpty());
     }
 
     @Test