[pulsar] branch branch-2.8 updated: fix flaky test in AdminApiOffloadTest (#11028)

[chenhang]

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

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


The following commit(s) were added to refs/heads/branch-2.8 by this push:
     new dd796d8  fix flaky test in AdminApiOffloadTest (#11028)
dd796d8 is described below

commit dd796d8af451e5d80dea9b33b34513dce8cee3a2
Author: hangc0276 <chenh...@apache.org>
AuthorDate: Wed Jun 23 23:09:06 2021 +0800

    fix flaky test in AdminApiOffloadTest (#11028)
    
    (cherry picked from commit 1a80429c8ba12f0ce487d6fecbce62c3ca952e1a)
---
 .../test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
index 9697459..f26f416 100644
--- 
a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
+++ 
b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiOffloadTest.java
@@ -47,7 +47,6 @@ import org.apache.pulsar.client.impl.MessageIdImpl;
 import org.apache.pulsar.common.naming.NamespaceName;
 import org.apache.pulsar.common.naming.TopicName;
 import org.apache.pulsar.common.policies.data.ClusterData;
-import org.apache.pulsar.common.policies.data.ClusterDataImpl;
 import org.apache.pulsar.common.policies.data.OffloadPolicies;
 import org.apache.pulsar.common.policies.data.OffloadPoliciesImpl;
 import org.apache.pulsar.common.policies.data.OffloadedReadPriority;
@@ -326,6 +325,8 @@ public class AdminApiOffloadTest extends 
MockedPulsarServiceBaseTest {
         Map<NamespaceName, LedgerOffloader> map = new HashMap<>();
         map.put(TopicName.get(topicName).getNamespaceObject(), 
namespaceOffloader);
         doReturn(map).when(pulsar).getLedgerOffloaderMap();
+        doReturn(namespaceOffloader).when(pulsar)
+                
.getManagedLedgerOffloader(TopicName.get(topicName).getNamespaceObject(), null);
 
         admin.topics().removeOffloadPolicies(topicName);
         Awaitility.await().untilAsserted(()