fix: unify the time wait for consumer in delay

Signed-off-by: wangxye <[email protected]>
AutoMQ · Nov 13, 2023 · 061d8f5 · 061d8f5
1 parent 3ece6b6
commit 061d8f5
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/java/e2e/src/main/java/org/apache/rocketmq/util/VerifyUtils.java b/java/e2e/src/main/java/org/apache/rocketmq/util/VerifyUtils.java
@@ -185,8 +185,15 @@ public static void verifyOrderMessage(DataCollector<Object> enqueueMessages,
     public static void verifyDelayMessage(DataCollector<Object> enqueueMessages,
         DataCollector<Object> dequeueMessages, int delayTime) {
         //Check whether the consumption is complete
-        Collection<Object> unConsumedMessages = waitForMessageConsume(enqueueMessages, dequeueMessages,
-            (TIMEOUT + delayTime) * 1000L, 1);
+        Collection<Object> unConsumedMessages = null;
+        if (delayTime == 0) {
+            unConsumedMessages = waitForMessageConsume(enqueueMessages, dequeueMessages,
+                (TIMEOUT / 2 + delayTime) * 1000L, 1);
+        } else {
+            unConsumedMessages = waitForMessageConsume(enqueueMessages, dequeueMessages,
+                (TIMEOUT + delayTime) * 1000L, 1);
+        }
+
         if (unConsumedMessages.size() > 0) {
             Assertions.fail(String.format("The following %s messages are not consumed: %s", unConsumedMessages.size(), unConsumedMessages));
         }