[pulsar] branch master updated: [fix][flaky-test] Change testAddRemoveConsumer to quarantine group (#16503)

[technoboy]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 56f96daf062 [fix][flaky-test] Change testAddRemoveConsumer to 
quarantine group (#16503)
56f96daf062 is described below

commit 56f96daf0620ecbd1360d8831eda86e77eaa3b06
Author: lipenghui <peng...@apache.org>
AuthorDate: Mon Jul 11 12:52:00 2022 +0800

    [fix][flaky-test] Change testAddRemoveConsumer to quarantine group (#16503)
---
 build/run_unit_group.sh                                        |  2 +-
 .../service/PersistentDispatcherFailoverConsumerTest.java      | 10 +++++++---
 ...stentDispatcherFailoverConsumerStreamingDispatcherTest.java |  2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh
index c18172160ea..ee322b6f230 100755
--- a/build/run_unit_group.sh
+++ b/build/run_unit_group.sh
@@ -64,7 +64,7 @@ alias echo='{ [[ $- =~ .*x.* ]] && trace_enabled=1 || 
trace_enabled=0; set +x; }
 
 # Test Groups  -- start --
 function test_group_broker_group_1() {
-  mvn_test -pl pulsar-broker -Dgroups='broker' -DtestReuseFork=false
+  mvn_test -pl pulsar-broker -Dgroups='broker' -DtestReuseFork=true 
-DskipAfterFailureCount=1
 }
 
 function test_group_broker_group_2() {
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java
index 1a77024a4ba..4e2e0323884 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentDispatcherFailoverConsumerTest.java
@@ -92,7 +92,7 @@ import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
-@Test(groups = "broker")
+@Test(groups = "quarantine")
 public class PersistentDispatcherFailoverConsumerTest {
 
     private BrokerService brokerService;
@@ -205,11 +205,15 @@ public class PersistentDispatcherFailoverConsumerTest {
             pulsar = null;
         }
 
-        executor.shutdown();
+        if (executor != null) {
+            executor.shutdown();
+        }
         if (eventLoopGroup != null) {
             eventLoopGroup.shutdownGracefully().get();
         }
-        store.close();
+        if (store != null) {
+            store.close();
+        }
     }
 
     void setupMLAsyncCallbackMocks() {
diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java
index b7a119fddde..0fc6db226a3 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentDispatcherFailoverConsumerStreamingDispatcherTest.java
@@ -26,7 +26,7 @@ import org.testng.annotations.Test;
 /**
  * PersistentDispatcherFailoverConsumerTest with {@link StreamingDispatcher}
  */
-@Test(groups = "broker")
+@Test(groups = "quarantine")
 public class PersistentDispatcherFailoverConsumerStreamingDispatcherTest 
extends PersistentDispatcherFailoverConsumerTest {
 
     @BeforeMethod(alwaysRun = true)