Add cleanup to BaseAuthzTest used in backport of PR apache#22305

(cherry picked from commit 91ee580)
lhotari · Mar 20, 2024 · 83d996b · 83d996b
1 parent c1f4d0a
commit 83d996b
Showing 1 changed file with 10 additions and 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
@@ -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 @@ protected void customizeNewPulsarAdminBuilder(PulsarAdminBuilder pulsarAdminBuil
         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();
     }
 }