You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by pe...@apache.org on 2022/08/12 12:05:29 UTC
[pulsar] branch master updated: [fix][flaky-test]AdminApi2Test.testDeleteTenant (#17070)
This is an automated email from the ASF dual-hosted git repository.
penghui pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 89e82a26dc1 [fix][flaky-test]AdminApi2Test.testDeleteTenant (#17070)
89e82a26dc1 is described below
commit 89e82a26dc103d8c8f2feaeb4a33a0b57dcbcb4e
Author: fengyubiao <yu...@streamnative.io>
AuthorDate: Fri Aug 12 20:05:23 2022 +0800
[fix][flaky-test]AdminApi2Test.testDeleteTenant (#17070)
---
.../java/org/apache/pulsar/broker/admin/AdminApi2Test.java | 13 +++++++++++++
.../java/org/apache/pulsar/broker/admin/AdminApiTest.java | 1 +
2 files changed, 14 insertions(+)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
index 410ad097f6a..b3072a693ee 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApi2Test.java
@@ -1336,6 +1336,13 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
@Test
public void testDeleteTenant() throws Exception {
+ // Disabled conf: systemTopicEnabled. see: https://github.com/apache/pulsar/pull/17070
+ boolean originalSystemTopicEnabled = conf.isSystemTopicEnabled();
+ if (originalSystemTopicEnabled) {
+ internalCleanup();
+ conf.setSystemTopicEnabled(false);
+ setup();
+ }
pulsar.getConfiguration().setForceDeleteNamespaceAllowed(false);
String tenant = "test-tenant-1";
@@ -1384,6 +1391,12 @@ public class AdminApi2Test extends MockedPulsarServiceBaseTest {
assertFalse(pulsar.getLocalMetadataStore().exists(partitionedTopicPath).join());
assertFalse(pulsar.getLocalMetadataStore().exists(localPoliciesPath).join());
assertFalse(pulsar.getLocalMetadataStore().exists(bundleDataPath).join());
+ // Reset conf: systemTopicEnabled
+ if (originalSystemTopicEnabled) {
+ internalCleanup();
+ conf.setSystemTopicEnabled(true);
+ setup();
+ }
}
@Test
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
index ece5f8d8302..329f4ba4cde 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/AdminApiTest.java
@@ -2919,6 +2919,7 @@ public class AdminApiTest extends MockedPulsarServiceBaseTest {
@Override
protected void setup() throws Exception {
super.conf.setLoadManagerClassName(conf.getLoadManagerClassName());
+ super.conf.setSystemTopicEnabled(conf.isSystemTopicEnabled());
super.internalSetup();
}