(pulsar) branch branch-2.11 updated: Add cleanup to BaseAuthzTest used in backport of PR #22305

[lhotari]

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

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


The following commit(s) were added to refs/heads/branch-2.11 by this push:
     new 91ee5807d1b Add cleanup to BaseAuthzTest used in backport of PR #22305
91ee5807d1b is described below

commit 91ee5807d1bf6d2b9ea393c768c9fe5eae1f71e2
Author: Lari Hotari <lhot...@apache.org>
AuthorDate: Wed Mar 20 17:47:09 2024 +0200

    Add cleanup to BaseAuthzTest used in backport of PR #22305
---
 .../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 2300a92e2df..cd9c6547cc3 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
@@ -55,7 +55,7 @@ public abstract class BaseAuthZTest extends 
MockedPulsarServiceBaseTest {
     protected PulsarAdmin superUserAdmin;
     protected PulsarAdmin tenantManagerAdmin;
 
-    @BeforeClass
+    @BeforeClass(alwaysRun = true)
     @Override
     protected void setup() throws Exception {
         conf.setAuthorizationEnabled(true);
@@ -99,9 +99,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();
     }
 }