From 68917869273f7629ba0b4bb327efac94db13a862 Mon Sep 17 00:00:00 2001
From: Zixuan Liu <nodeces@gmail.com>
Date: Wed, 15 May 2024 01:49:11 +0800
Subject: [PATCH] Disable flaky ResourceGroup tests

Signed-off-by: Zixuan Liu <nodeces@gmail.com>
---
 build/run_unit_group.sh                               |  2 +-
 .../RGUsageMTAggrWaitForAllMsgsTest.java              | 11 ++++++-----
 ...ResourceGroupUsageAggregationOnTopicLevelTest.java |  8 +++++---
 .../ResourceGroupUsageAggregationTest.java            |  4 +++-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/build/run_unit_group.sh b/build/run_unit_group.sh
index a5af838e4d4d06..808c63634fb717 100755
--- a/build/run_unit_group.sh
+++ b/build/run_unit_group.sh
@@ -42,7 +42,7 @@ function broker_group_1() {
 }
 
 function broker_group_2() {
-  $MVN_TEST_COMMAND -pl pulsar-broker -Dgroups='schema,utils,functions-worker,broker-io,broker-discovery,broker-compaction,broker-naming,websocket,other' -DtestReuseFork=false
+  $MVN_TEST_COMMAND -pl pulsar-broker -Dgroups='schema,utils,functions-worker,broker-io,broker-discovery,broker-compaction,broker-naming,websocket,other' -DtestReuseFork=false -DfailIfNoTests=false
 }
 
 function broker_group_3() {
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
index 4f789fef4f19a1..3e8cedbe2aa2f5 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/RGUsageMTAggrWaitForAllMsgsTest.java
@@ -47,6 +47,7 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 
@@ -56,7 +57,7 @@
 // After sending/receiving all the messages, traffic usage statistics, and Prometheus-metrics
 // are verified on the RGs.
 @Slf4j
-@Test(groups = "flaky")
+@Ignore
 public class RGUsageMTAggrWaitForAllMsgsTest extends ProducerConsumerBase {
     @BeforeClass
     @Override
@@ -93,22 +94,22 @@ protected void cleanup() throws Exception {
         super.internalCleanup();
     }
 
-    @Test
+    @Test(enabled = false)
     public void testMTProduceConsumeRGUsagePersistentTopicNamesSameTenant() throws Exception {
         testProduceConsumeUsageOnRG(PersistentTopicNamesSameTenantAndNsRGs);
     }
 
-    @Test
+    @Test(enabled = false)
     public void testMTProduceConsumeRGUsagePersistentTopicNamesDifferentTenant() throws Exception {
         testProduceConsumeUsageOnRG(PersistentTopicNamesDifferentTenantAndNsRGs);
     }
 
-    @Test
+    @Test(enabled = false)
     public void testMTProduceConsumeRGUsageNonPersistentTopicNamesSameTenant() throws Exception {
         testProduceConsumeUsageOnRG(NonPersistentTopicNamesSameTenantAndNsRGs);
     }
 
-    @Test
+    @Test(enabled = false)
     public void testMTProduceConsumeRGUsageNonPersistentTopicNamesDifferentTenant() throws Exception {
         testProduceConsumeUsageOnRG(NonPersistentTopicNamesDifferentTenantAndNsRGs);
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationOnTopicLevelTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationOnTopicLevelTest.java
index f5f615709ca11a..bbad3e726e960e 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationOnTopicLevelTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationOnTopicLevelTest.java
@@ -43,9 +43,11 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 @Slf4j
+@Ignore
 public class ResourceGroupUsageAggregationOnTopicLevelTest extends ProducerConsumerBase {
 
     private final String TenantName = "pulsar-test";
@@ -76,12 +78,12 @@ protected void cleanup() throws Exception {
         super.internalCleanup();
     }
 
-    @Test
+    @Test(enabled = false)
     public void testPersistentTopicProduceConsumeUsageOnRG() throws Exception {
         testProduceConsumeUsageOnRG(PRODUCE_CONSUME_PERSISTENT_TOPIC);
     }
-    
-    @Test
+
+    @Test(enabled = false)
     public void testNonPersistentTopicProduceConsumeUsageOnRG() throws Exception {
         testProduceConsumeUsageOnRG(PRODUCE_CONSUME_NON_PERSISTENT_TOPIC);
     }
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java
index c562e39e4becac..098e82cc087b92 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/resourcegroup/ResourceGroupUsageAggregationTest.java
@@ -40,12 +40,14 @@
 import org.testng.Assert;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Ignore;
 import org.testng.annotations.Test;
 
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
 @Slf4j
+@Ignore
 public class ResourceGroupUsageAggregationTest extends ProducerConsumerBase {
     @BeforeClass
     @Override
@@ -77,7 +79,7 @@ protected void cleanup() throws Exception {
         super.internalCleanup();
     }
 
-    @Test
+    @Test(enabled = false)
     public void testProduceConsumeUsageOnRG() throws Exception {
         testProduceConsumeUsageOnRG(PRODUCE_CONSUME_PERSISTENT_TOPIC);
         testProduceConsumeUsageOnRG(PRODUCE_CONSUME_NON_PERSISTENT_TOPIC);