[pulsar] 08/10: Fix MessagePublishBufferThrottleTest flaky-test (#8733)

[yong]

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

yong pushed a commit to branch branch-2.7
in repository https://gitbox.apache.org/repos/asf/pulsar.git

commit bc4cb4ceae33bb80e5d5394aa5d671401e056992
Author: feynmanlin <feynman...@tencent.com>
AuthorDate: Sat Nov 28 00:40:45 2020 +0800

    Fix MessagePublishBufferThrottleTest flaky-test (#8733)
    
    (cherry picked from commit 34b1d5afee0609bbfa032f0ea9a479951b1fcc47)
---
 .../pulsar/broker/service/MessagePublishBufferThrottleTest.java    | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java
index 91ce32b..6dd4515 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/MessagePublishBufferThrottleTest.java
@@ -22,6 +22,7 @@ import org.apache.pulsar.client.api.MessageId;
 import org.apache.pulsar.client.api.Producer;
 import org.apache.pulsar.common.util.FutureUtil;
 import org.testng.Assert;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.Test;
 
 import java.util.ArrayList;
@@ -38,9 +39,10 @@ public class MessagePublishBufferThrottleTest extends 
BrokerTestBase {
         //No-op
     }
 
+    @AfterMethod(alwaysRun = true)
     @Override
     protected void cleanup() throws Exception {
-        //No-op
+        super.internalCleanup();
     }
 
     @Test
@@ -70,7 +72,6 @@ public class MessagePublishBufferThrottleTest extends 
BrokerTestBase {
         }
         Thread.sleep(20);
         
Assert.assertFalse(pulsar.getBrokerService().isReachMessagePublishBufferThreshold());
-        super.internalCleanup();
     }
 
     @Test
@@ -107,7 +108,6 @@ public class MessagePublishBufferThrottleTest extends 
BrokerTestBase {
             Assert.assertNotNull(future.get());
         }
         
Assert.assertEquals(pulsar.getBrokerService().getCurrentMessagePublishBufferSize(),
 0L);
-        super.internalCleanup();
     }
 
     @Test
@@ -153,6 +153,5 @@ public class MessagePublishBufferThrottleTest extends 
BrokerTestBase {
             Assert.assertNotNull(future.get());
         }
         
Assert.assertEquals(pulsar.getBrokerService().getCurrentMessagePublishBufferSize(),
 0L);
-        super.internalCleanup();
     }
 }