From 52ed235bc53752e821ac7951c4bcfa4c943bc460 Mon Sep 17 00:00:00 2001 From: coderzc Date: Thu, 20 Oct 2022 19:53:37 +0800 Subject: [PATCH 1/4] Move out some already stable test from flaky group. --- .../apache/pulsar/broker/admin/PersistentTopicsTest.java | 1 - .../apache/pulsar/broker/admin/TopicMessageTTLTest.java | 1 - .../java/org/apache/pulsar/broker/auth/AuthLogsTest.java | 1 - .../org/apache/pulsar/broker/auth/AuthorizationTest.java | 1 - .../pulsar/broker/service/InactiveTopicDeleteTest.java | 1 - .../org/apache/pulsar/broker/service/ServerCnxTest.java | 1 - .../PersistentTopicStreamingDispatcherE2ETest.java | 2 -- .../pulsar/client/api/ClientDeduplicationTest.java | 2 -- .../apache/pulsar/client/impl/MultiTopicsReaderTest.java | 1 - .../org/apache/pulsar/client/impl/RawReaderTest.java | 1 - .../pulsar/client/impl/TransactionEndToEndTest.java | 9 ++++----- .../TransactionEndToEndWithoutBatchIndexAckTest.java | 1 - .../org/apache/pulsar/compaction/CompactionTest.java | 5 ++--- 13 files changed, 6 insertions(+), 21 deletions(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java index 5aef3644f2db4..b023b434c7483 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java @@ -99,7 +99,6 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") public class PersistentTopicsTest extends MockedPulsarServiceBaseTest { private PersistentTopics persistentTopics; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java index d1fa01306f756..f57de9ecce532 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java @@ -36,7 +36,6 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") public class TopicMessageTTLTest extends MockedPulsarServiceBaseTest { private final String testTenant = "my-tenant"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java index d0243ecdef1dd..c38c66c861644 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java @@ -41,7 +41,6 @@ * However it is useful to see which logs are produced when there's an * failure or error in authentication. */ -@Test(groups = "flaky") public class AuthLogsTest extends MockedPulsarServiceBaseTest { private static final Logger log = LoggerFactory.getLogger(AuthLogsTest.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java index b533f8ce8b221..964001b4c5444 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java @@ -38,7 +38,6 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; -@Test(groups = "flaky") public class AuthorizationTest extends MockedPulsarServiceBaseTest { public AuthorizationTest() { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java index 1013e79916cc4..d455a90794480 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java @@ -45,7 +45,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = "flaky") public class InactiveTopicDeleteTest extends BrokerTestBase { @BeforeMethod diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java index 0650cce32b588..ac0815aa63c0f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java @@ -141,7 +141,6 @@ import org.testng.annotations.Test; @SuppressWarnings("unchecked") -@Test(groups = "flaky") public class ServerCnxTest { protected EmbeddedChannel channel; private ServiceConfiguration svcConfig; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java index a6fe95e781884..a578853ca1879 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java @@ -20,12 +20,10 @@ import org.apache.pulsar.broker.service.PersistentTopicE2ETest; import org.apache.pulsar.broker.service.streamingdispatch.StreamingDispatcher; -import org.testng.annotations.Test; /** * PersistentTopicE2ETest with {@link StreamingDispatcher} */ -@Test(groups = "flaky") public class PersistentTopicStreamingDispatcherE2ETest extends PersistentTopicE2ETest { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java index c8acc7d46f82d..51eed16213f19 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java @@ -23,7 +23,6 @@ import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; - import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -41,7 +40,6 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") public class ClientDeduplicationTest extends ProducerConsumerBase { @DataProvider diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java index 2974c39744f48..fff7322e8e31b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java @@ -66,7 +66,6 @@ import org.testng.annotations.Test; @Slf4j -@Test(groups = "flaky") public class MultiTopicsReaderTest extends MockedPulsarServiceBaseTest { private static final String subscription = "reader-multi-topics-sub"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java index 2fa92bbfa80fa..8ba7662dcc4bd 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java @@ -49,7 +49,6 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -@Test(groups = "flaky") public class RawReaderTest extends MockedPulsarServiceBaseTest { private static final String subscription = "foobar-sub"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java index e3fc05ae0424e..dda101b3bee4f 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java @@ -27,21 +27,21 @@ import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import io.netty.channel.ChannelHandlerContext; +import io.netty.util.concurrent.EventExecutor; import java.lang.reflect.Constructor; import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.Collection; +import java.util.List; import java.util.Optional; import java.util.Set; import java.util.TreeSet; import java.util.concurrent.CompletableFuture; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicReference; -import io.netty.channel.ChannelHandlerContext; -import io.netty.util.concurrent.EventExecutor; import lombok.Cleanup; import lombok.extern.slf4j.Slf4j; import org.apache.bookkeeper.mledger.Position; @@ -89,7 +89,6 @@ * End to end transaction test. */ @Slf4j -@Test(groups = "flaky") public class TransactionEndToEndTest extends TransactionTestBase { protected static final int TOPIC_PARTITION = 3; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java index 0b50be807be42..3d169d184d1bb 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java @@ -27,7 +27,6 @@ * End to end transaction test. */ @Slf4j -@Test(groups = "flaky") public class TransactionEndToEndWithoutBatchIndexAckTest extends TransactionEndToEndTest { @BeforeClass diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java index ddad53fbc829f..a214d4a5ff6af 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java @@ -22,12 +22,13 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; -import static org.testng.Assert.assertFalse; import com.google.common.collect.Sets; import com.google.common.util.concurrent.ThreadFactoryBuilder; +import io.netty.buffer.ByteBuf; import java.io.IOException; import java.nio.charset.StandardCharsets; import java.nio.file.Files; @@ -45,7 +46,6 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import io.netty.buffer.ByteBuf; import lombok.Cleanup; import lombok.SneakyThrows; import org.apache.bookkeeper.client.BookKeeper; @@ -90,7 +90,6 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; -@Test(groups = "flaky") public class CompactionTest extends MockedPulsarServiceBaseTest { private ScheduledExecutorService compactionScheduler; private BookKeeper bk; From 7d21f1e7d1400c6bd31682bf5cff4092b658da13 Mon Sep 17 00:00:00 2001 From: coderzc Date: Fri, 21 Oct 2022 10:58:15 +0800 Subject: [PATCH 2/4] Assigned tests to some test group explicitly --- .../org/apache/pulsar/broker/admin/PersistentTopicsTest.java | 1 + .../org/apache/pulsar/broker/admin/TopicMessageTTLTest.java | 1 + .../test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java | 1 + .../java/org/apache/pulsar/broker/auth/AuthorizationTest.java | 1 + .../apache/pulsar/broker/service/InactiveTopicDeleteTest.java | 1 + .../java/org/apache/pulsar/broker/service/ServerCnxTest.java | 1 + .../persistent/PersistentTopicStreamingDispatcherE2ETest.java | 2 ++ .../org/apache/pulsar/client/api/ClientDeduplicationTest.java | 1 + .../org/apache/pulsar/client/impl/MultiTopicsReaderTest.java | 1 + .../test/java/org/apache/pulsar/client/impl/RawReaderTest.java | 1 + .../org/apache/pulsar/client/impl/TransactionEndToEndTest.java | 1 + .../impl/TransactionEndToEndWithoutBatchIndexAckTest.java | 1 + .../test/java/org/apache/pulsar/compaction/CompactionTest.java | 1 + 13 files changed, 14 insertions(+) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java index b023b434c7483..0865e3ccace35 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java @@ -99,6 +99,7 @@ import org.testng.annotations.Test; @Slf4j +@Test(groups = "broker-admin") public class PersistentTopicsTest extends MockedPulsarServiceBaseTest { private PersistentTopics persistentTopics; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java index f57de9ecce532..33b311cc2cd9b 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/TopicMessageTTLTest.java @@ -36,6 +36,7 @@ import org.testng.annotations.Test; @Slf4j +@Test(groups = "broker-admin") public class TopicMessageTTLTest extends MockedPulsarServiceBaseTest { private final String testTenant = "my-tenant"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java index c38c66c861644..e555510ec534a 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthLogsTest.java @@ -41,6 +41,7 @@ * However it is useful to see which logs are produced when there's an * failure or error in authentication. */ +@Test(groups = "broker") public class AuthLogsTest extends MockedPulsarServiceBaseTest { private static final Logger log = LoggerFactory.getLogger(AuthLogsTest.class); diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java index 964001b4c5444..71d21bc213e60 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/AuthorizationTest.java @@ -38,6 +38,7 @@ import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = "broker") public class AuthorizationTest extends MockedPulsarServiceBaseTest { public AuthorizationTest() { diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java index d455a90794480..389386b787f60 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/InactiveTopicDeleteTest.java @@ -45,6 +45,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +@Test(groups = "broker") public class InactiveTopicDeleteTest extends BrokerTestBase { @BeforeMethod diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java index ac0815aa63c0f..648ba10e82a82 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/ServerCnxTest.java @@ -141,6 +141,7 @@ import org.testng.annotations.Test; @SuppressWarnings("unchecked") +@Test(groups = "broker") public class ServerCnxTest { protected EmbeddedChannel channel; private ServiceConfiguration svcConfig; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java index a578853ca1879..7fbd9852e7fdc 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java @@ -20,10 +20,12 @@ import org.apache.pulsar.broker.service.PersistentTopicE2ETest; import org.apache.pulsar.broker.service.streamingdispatch.StreamingDispatcher; +import org.testng.annotations.Test; /** * PersistentTopicE2ETest with {@link StreamingDispatcher} */ +@Test(groups = "broker") public class PersistentTopicStreamingDispatcherE2ETest extends PersistentTopicE2ETest { @Override diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java index 51eed16213f19..867f783335628 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/api/ClientDeduplicationTest.java @@ -40,6 +40,7 @@ import org.testng.annotations.Test; @Slf4j +@Test(groups = "broker-api") public class ClientDeduplicationTest extends ProducerConsumerBase { @DataProvider diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java index fff7322e8e31b..20271ca84fe15 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/MultiTopicsReaderTest.java @@ -66,6 +66,7 @@ import org.testng.annotations.Test; @Slf4j +@Test(groups = "broker-impl") public class MultiTopicsReaderTest extends MockedPulsarServiceBaseTest { private static final String subscription = "reader-multi-topics-sub"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java index 8ba7662dcc4bd..fbf216f801494 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/RawReaderTest.java @@ -49,6 +49,7 @@ import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +@Test(groups = "broker-impl") public class RawReaderTest extends MockedPulsarServiceBaseTest { private static final String subscription = "foobar-sub"; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java index dda101b3bee4f..3c5590fce4dc0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndTest.java @@ -89,6 +89,7 @@ * End to end transaction test. */ @Slf4j +@Test(groups = "broker-impl") public class TransactionEndToEndTest extends TransactionTestBase { protected static final int TOPIC_PARTITION = 3; diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java index 3d169d184d1bb..9b338aadc20a0 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/client/impl/TransactionEndToEndWithoutBatchIndexAckTest.java @@ -27,6 +27,7 @@ * End to end transaction test. */ @Slf4j +@Test(groups = "broker-impl") public class TransactionEndToEndWithoutBatchIndexAckTest extends TransactionEndToEndTest { @BeforeClass diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java index a214d4a5ff6af..3e85d432d9fd8 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/compaction/CompactionTest.java @@ -90,6 +90,7 @@ import org.testng.annotations.DataProvider; import org.testng.annotations.Test; +@Test(groups = "broker-impl") public class CompactionTest extends MockedPulsarServiceBaseTest { private ScheduledExecutorService compactionScheduler; private BookKeeper bk; From f542fe2ba4343bd52c7759d7902e27e82c2376ca Mon Sep 17 00:00:00 2001 From: coderzc Date: Wed, 26 Oct 2022 14:20:00 +0800 Subject: [PATCH 3/4] fix test --- .../org/apache/pulsar/broker/admin/PersistentTopicsTest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java index 0865e3ccace35..9ab8912529700 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/PersistentTopicsTest.java @@ -92,6 +92,7 @@ import org.apache.zookeeper.KeeperException; import org.awaitility.Awaitility; import org.mockito.ArgumentCaptor; +import org.mockito.internal.util.MockUtil; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeClass; @@ -1501,6 +1502,8 @@ public void testDeleteTopic() throws Exception { verify(response, timeout(5000).times(1)).resume(responseCaptor.capture()); Assert.assertEquals(responseCaptor.getValue().getStatus(), Response.Status.NO_CONTENT.getStatusCode()); + MockUtil.resetMock(brokerService); + CompletableFuture deleteTopicFuture2 = new CompletableFuture<>(); ArgumentCaptor errorCaptor = ArgumentCaptor.forClass(RestException.class); deleteTopicFuture2.completeExceptionally(new MetadataStoreException("test exception")); @@ -1511,6 +1514,8 @@ public void testDeleteTopic() throws Exception { Assert.assertEquals(errorCaptor.getValue().getResponse().getStatus(), Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()); + MockUtil.resetMock(brokerService); + CompletableFuture deleteTopicFuture3 = new CompletableFuture<>(); response = mock(AsyncResponse.class); deleteTopicFuture3.completeExceptionally(new MetadataStoreException.NotFoundException()); From ea67f751ee0c0b2aea1527b3c7e5f8c9f7dfa373 Mon Sep 17 00:00:00 2001 From: coderzc Date: Fri, 28 Oct 2022 12:46:33 +0800 Subject: [PATCH 4/4] Address comment --- .../persistent/PersistentTopicStreamingDispatcherE2ETest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java index 6e648b66bf1fd..991225b3a4d28 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/persistent/PersistentTopicStreamingDispatcherE2ETest.java @@ -25,7 +25,7 @@ /** * PersistentTopicE2ETest with {@link StreamingDispatcher} */ -@Test(groups = "broker") +@Test(groups = "flaky") public class PersistentTopicStreamingDispatcherE2ETest extends PersistentTopicE2ETest { @Override