[pulsar] branch branch-2.9 updated: [fix][flaky-test] Try to fix flaky test related to PersistentTopicTest.setup (#16383)

[bogong]

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

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


The following commit(s) were added to refs/heads/branch-2.9 by this push:
     new 14865a534be [fix][flaky-test] Try to fix flaky test related to 
PersistentTopicTest.setup (#16383)
14865a534be is described below

commit 14865a534be8d55b5a30c4d91dbdd601bd9926fc
Author: lipenghui <peng...@apache.org>
AuthorDate: Tue Jul 5 09:10:41 2022 +0800

    [fix][flaky-test] Try to fix flaky test related to 
PersistentTopicTest.setup (#16383)
    
    (cherry picked from commit ea45f2faba3a8ccb01bea2ddf5171222fc00b6b7)
---
 .../java/org/apache/pulsar/broker/service/PersistentTopicTest.java     | 3 +++
 1 file changed, 3 insertions(+)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
index 3e527e8135a..85f6e422ad0 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/service/PersistentTopicTest.java
@@ -99,6 +99,7 @@ import org.apache.pulsar.broker.ServiceConfiguration;
 import org.apache.pulsar.broker.namespace.NamespaceService;
 import org.apache.pulsar.broker.resources.NamespaceResources;
 import org.apache.pulsar.broker.resources.PulsarResources;
+import org.apache.pulsar.broker.resources.TopicResources;
 import org.apache.pulsar.broker.service.persistent.CompactorSubscription;
 import 
org.apache.pulsar.broker.service.persistent.PersistentDispatcherMultipleConsumers;
 import 
org.apache.pulsar.broker.service.persistent.PersistentDispatcherSingleActiveConsumer;
@@ -202,7 +203,9 @@ public class PersistentTopicTest extends 
MockedBookKeeperTestCase {
         store = new ZKMetadataStore(mockZk);
         PulsarResources pulsarResources = 
spyWithClassAndConstructorArgs(PulsarResources.class, store, store);
         NamespaceResources nsr = 
spyWithClassAndConstructorArgs(NamespaceResources.class, store, store, 30);
+        TopicResources tsr = 
spyWithClassAndConstructorArgs(TopicResources.class, store);
         doReturn(nsr).when(pulsarResources).getNamespaceResources();
+        doReturn(tsr).when(pulsarResources).getTopicResources();
         doReturn(pulsarResources).when(pulsar).getPulsarResources();
 
         doReturn(store).when(pulsar).getLocalMetadataStore();