[incubator-pulsar] branch master updated: Fixed BatchMessageTest intermittent failures (#1577)

[sijie]

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

sijie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-pulsar.git


The following commit(s) were added to refs/heads/master by this push:
     new 2d4a350  Fixed BatchMessageTest intermittent failures (#1577)
2d4a350 is described below

commit 2d4a35077e23c989fa41fed617984d0498d76ea4
Author: Matteo Merli <mme...@apache.org>
AuthorDate: Fri Apr 13 23:32:21 2018 -0700

    Fixed BatchMessageTest intermittent failures (#1577)
---
 .../java/org/apache/pulsar/broker/service/BatchMessageTest.java  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
index 5a60ff3..9f9ab35 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/BatchMessageTest.java
@@ -23,6 +23,8 @@ import static org.testng.Assert.assertEquals;
 import static org.testng.Assert.assertNotNull;
 import static org.testng.Assert.assertTrue;
 
+import com.google.common.collect.Lists;
+
 import java.util.HashSet;
 import java.util.List;
 import java.util.Random;
@@ -52,8 +54,6 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.DataProvider;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.Lists;
-
 public class BatchMessageTest extends BrokerTestBase {
 
     @BeforeClass
@@ -372,7 +372,6 @@ public class BatchMessageTest extends BrokerTestBase {
         PersistentTopic topic = (PersistentTopic) 
pulsar.getBrokerService().getTopicReference(topicName).get();
 
         // allow stats to be updated..
-        Thread.sleep(5000);
         LOG.info("[{}] checking backlog stats..");
         rolloverPerIntervalStats();
         
assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(),
 numMsgs / numMsgsInBatch);
@@ -387,10 +386,10 @@ public class BatchMessageTest extends BrokerTestBase {
         if (lastunackedMsg != null) {
             consumer.acknowledgeCumulative(lastunackedMsg);
         }
-        Thread.sleep(100);
-        
assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(),
 0);
+
         consumer.close();
         producer.close();
+        
assertEquals(topic.getSubscription(subscriptionName).getNumberOfEntriesInBacklog(),
 0);
     }
 
     // test for ack holes

-- 
To stop receiving notification emails like this one, please contact
si...@apache.org.