[pulsar] 01/15: [tools] fix TestRunMain test (#12675)

[penghui]

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

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

commit 92e10691173aa356d54b6f5af6e5106712154e6e
Author: Rajan Dhabalia <rdhaba...@apache.org>
AuthorDate: Mon Nov 8 23:42:12 2021 -0800

    [tools] fix TestRunMain test (#12675)
    
    (cherry picked from commit 24b0f4f1ba347a27f140d820e7ac0b0a9a421dcb)
---
 .../src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java   | 5 +++++
 .../src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java       | 4 +++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
index 595f6ce..43c7607 100644
--- 
a/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
+++ 
b/pulsar-client-tools/src/main/java/org/apache/pulsar/admin/cli/PulsarAdminTool.java
@@ -20,6 +20,7 @@ package org.apache.pulsar.admin.cli;
 
 import com.beust.jcommander.JCommander;
 import com.beust.jcommander.Parameter;
+import com.google.common.annotations.VisibleForTesting;
 
 import java.io.FileInputStream;
 import java.lang.reflect.InvocationTargetException;
@@ -352,5 +353,9 @@ public class PulsarAdminTool {
         return lastExitCode;
     }
 
+    @VisibleForTesting
+    static void resetLastExitCode() {
+        lastExitCode = Integer.MIN_VALUE;
+    }
 
 }
diff --git 
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
 
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
index 1e470ff..1d65913 100644
--- 
a/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
+++ 
b/pulsar-client-tools/src/test/java/org/apache/pulsar/admin/cli/TestRunMain.java
@@ -29,13 +29,15 @@ public class TestRunMain {
 
     @Test
     public void runMainNoArguments() throws Exception {
+        PulsarAdminTool.resetLastExitCode();
         PulsarAdminTool.setAllowSystemExit(false);
         PulsarAdminTool.main(new String[0]);
-        assertEquals(PulsarAdminTool.getLastExitCode(), 1);
+        assertEquals(PulsarAdminTool.getLastExitCode(), 0);
     }
 
     @Test
     public void runMainDummyConfigFile() throws Exception {
+        PulsarAdminTool.resetLastExitCode();
         PulsarAdminTool.setAllowSystemExit(false);
         Path dummyEmptyFile = Files.createTempFile("test", ".conf");
         PulsarAdminTool.main(new String[] 
{dummyEmptyFile.toAbsolutePath().toString()});