This is an automated email from the ASF dual-hosted git repository. xyz pushed a commit to branch branch-2.8 in repository https://gitbox.apache.org/repos/asf/pulsar.git
commit cce4926bb59e912038c82ca86a6d7ed213430718 Author: Yunze Xu <[email protected]> AuthorDate: Mon Aug 1 17:59:30 2022 +0800 Fix broken tests introduced by 0db8ac04 Migrate the `setupDefaultTenantAndNamespace` method from https://github.com/apache/pulsar/pull/14243. --- .../broker/auth/MockedPulsarServiceBaseTest.java | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java index a98283125f3..9e774a1a2ba 100644 --- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java +++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/auth/MockedPulsarServiceBaseTest.java @@ -33,6 +33,7 @@ import io.netty.channel.EventLoopGroup; import java.net.URI; import java.net.URL; import java.util.ArrayList; +import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Optional; @@ -489,5 +490,24 @@ public abstract class MockedPulsarServiceBaseTest extends TestRetrySupport { return configuration; } + protected void setupDefaultTenantAndNamespace() throws Exception { + final String tenant = "public"; + final String namespace = tenant + "/default"; + + if (!admin.clusters().getClusters().contains(configClusterName)) { + admin.clusters().createCluster(configClusterName, + ClusterData.builder().serviceUrl(pulsar.getWebServiceAddress()).build()); + } + + if (!admin.tenants().getTenants().contains(tenant)) { + admin.tenants().createTenant(tenant, new TenantInfoImpl(Collections.emptySet(), + Sets.newHashSet(configClusterName))); + } + + if (!admin.namespaces().getNamespaces(tenant).contains(namespace)) { + admin.namespaces().createNamespace(namespace); + } + } + private static final Logger log = LoggerFactory.getLogger(MockedPulsarServiceBaseTest.class); }
