You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2024/03/20 15:50:13 UTC
(pulsar) branch branch-2.10 updated: Add cleanup to BaseAuthzTest used in backport of PR #22305
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch branch-2.10
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/branch-2.10 by this push:
new 83d996b6b2b Add cleanup to BaseAuthzTest used in backport of PR #22305
83d996b6b2b is described below
commit 83d996b6b2bfa9f730bf7352f0e8f7fda5fde373
Author: Lari Hotari <lh...@apache.org>
AuthorDate: Wed Mar 20 17:47:09 2024 +0200
Add cleanup to BaseAuthzTest used in backport of PR #22305
(cherry picked from commit 91ee5807d1bf6d2b9ea393c768c9fe5eae1f71e2)
---
.../java/org/apache/pulsar/broker/admin/BaseAuthZTest.java | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BaseAuthZTest.java b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BaseAuthZTest.java
index 58d8da8d160..f5d82b42fc9 100644
--- a/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BaseAuthZTest.java
+++ b/pulsar-broker/src/test/java/org/apache/pulsar/broker/admin/BaseAuthZTest.java
@@ -56,7 +56,7 @@ public abstract class BaseAuthZTest extends MockedPulsarServiceBaseTest {
protected PulsarAdmin superUserAdmin;
protected PulsarAdmin tenantManagerAdmin;
- @BeforeClass
+ @BeforeClass(alwaysRun = true)
@Override
protected void setup() throws Exception {
conf.setSystemTopicEnabled(true);
@@ -102,9 +102,17 @@ public abstract class BaseAuthZTest extends MockedPulsarServiceBaseTest {
pulsarAdminBuilder.authentication(new AuthenticationToken(SUPER_USER_TOKEN));
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
@Override
protected void cleanup() throws Exception {
+ if (superUserAdmin != null) {
+ superUserAdmin.close();
+ superUserAdmin = null;
+ }
+ if (tenantManagerAdmin != null) {
+ tenantManagerAdmin.close();
+ tenantManagerAdmin = null;
+ }
internalCleanup();
}
}