From 3b8be75a14fe87968a5823346db4f1f8afcadf1c Mon Sep 17 00:00:00 2001
From: Volodymyr Babak <volodymyr.babak@gmail.com>
Date: Fri, 31 Jan 2025 18:24:50 +0200
Subject: [PATCH] DeviceEdgeTest.testSendOutdatedAttributeToCloud - improved
 stability for concurrent issue

---
 .../java/org/thingsboard/server/edge/DeviceEdgeTest.java | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
index 060e641b93..80e7d2aed4 100644
--- a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
@@ -500,6 +500,15 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
         attributesNode.put("test_attr", originalValue);
         doPost("/api/plugins/telemetry/DEVICE/" + device.getId() + "/attributes/SERVER_SCOPE", attributesNode);
 
+        // Wait before device attributes saved to database
+        Awaitility.await()
+                .atMost(10, TimeUnit.SECONDS)
+                .until(() -> {
+                    String urlTemplate = "/api/plugins/telemetry/DEVICE/" + device.getId() + "/keys/attributes/" + DataConstants.SERVER_SCOPE;
+                    List<String> actualKeys = doGetAsyncTyped(urlTemplate, new TypeReference<>() {});
+                    return actualKeys != null && !actualKeys.isEmpty() && actualKeys.contains("test_attr");
+                });
+
         JsonObject attributesData = new JsonObject();
         // incorrect msg, will not be saved, because of ts is lower than for already existing
         String attributesKey = "test_attr";