From 9abfd128aed4663115d77bf518d9c38671d6ea78 Mon Sep 17 00:00:00 2001
From: YevhenBondarenko <ybondarenko@thingsboard.io>
Date: Fri, 17 Nov 2023 13:35:12 +0100
Subject: [PATCH] fixed fluky tests

---
 .../server/msa/connectivity/MqttClientTest.java          | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttClientTest.java b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttClientTest.java
index 5a7e9b631d..6ad50196b3 100644
--- a/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttClientTest.java
+++ b/msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/MqttClientTest.java
@@ -26,6 +26,7 @@ import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.mqtt.MqttQoS;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
+import org.awaitility.Awaitility;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
@@ -337,8 +338,12 @@ public class MqttClientTest extends AbstractContainerTest {
         MqttClient mqttClient = getMqttClient(deviceCredentials, listener);
 
         testRestClient.deleteDeviceIfExists(device.getId());
-        TimeUnit.SECONDS.sleep(3 * timeoutMultiplier);
-        assertThat(mqttClient.isConnected()).isFalse();
+
+        Awaitility
+                .await()
+                .alias("Check device connection.")
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> !mqttClient.isConnected());
     }
 
     @Test