HBASE-27279 Addendum fix TestSaslTlsIPCRejectPlainText
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestTlsRejectPlainText.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestTlsRejectPlainText.java
index 9e69e92..9586fde 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestTlsRejectPlainText.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/AbstractTestTlsRejectPlainText.java
@@ -59,7 +59,7 @@
public abstract class AbstractTestTlsRejectPlainText {
- protected static final HBaseCommonTestingUtil UTIL = new HBaseCommonTestingUtil();
+ protected static HBaseCommonTestingUtil UTIL;
protected static File DIR;
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestNettyTlsIPCRejectPlainText.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestNettyTlsIPCRejectPlainText.java
index d9a1413..378101f 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestNettyTlsIPCRejectPlainText.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestNettyTlsIPCRejectPlainText.java
@@ -19,6 +19,7 @@
import java.io.IOException;
import org.apache.hadoop.hbase.HBaseClassTestRule;
+import org.apache.hadoop.hbase.HBaseCommonTestingUtil;
import org.apache.hadoop.hbase.ipc.TestProtobufRpcServiceImpl;
import org.apache.hadoop.hbase.testclassification.MediumTests;
import org.apache.hadoop.hbase.testclassification.RPCTests;
@@ -41,6 +42,7 @@
@BeforeClass
public static void setUpBeforeClass() throws IOException {
+ UTIL = new HBaseCommonTestingUtil();
initialize();
}
diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSaslTlsIPCRejectPlainText.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSaslTlsIPCRejectPlainText.java
index 8c0d459..a6984fc 100644
--- a/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSaslTlsIPCRejectPlainText.java
+++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/security/TestSaslTlsIPCRejectPlainText.java
@@ -46,9 +46,7 @@
public static final HBaseClassTestRule CLASS_RULE =
HBaseClassTestRule.forClass(TestSaslTlsIPCRejectPlainText.class);
- private static final HBaseTestingUtil UTIL = new HBaseTestingUtil();
-
- private static final File KEYTAB_FILE = new File(UTIL.getDataTestDir("keytab").toUri().getPath());
+ private static File KEYTAB_FILE;
private static MiniKdc KDC;
private static String HOST = "localhost";
@@ -57,13 +55,16 @@
@BeforeClass
public static void setUpBeforeClass() throws Exception {
+ HBaseTestingUtil util = new HBaseTestingUtil();
+ UTIL = util;
initialize();
- KDC = UTIL.setupMiniKdc(KEYTAB_FILE);
+ KEYTAB_FILE = new File(util.getDataTestDir("keytab").toUri().getPath());
+ KDC = util.setupMiniKdc(KEYTAB_FILE);
PRINCIPAL = "hbase/" + HOST;
KDC.createPrincipal(KEYTAB_FILE, PRINCIPAL);
HBaseKerberosUtils.setPrincipalForTesting(PRINCIPAL + "@" + KDC.getRealm());
UGI = loginKerberosPrincipal(KEYTAB_FILE.getCanonicalPath(), PRINCIPAL);
- setSecuredConfiguration(UTIL.getConfiguration());
+ setSecuredConfiguration(util.getConfiguration());
SecurityInfo securityInfoMock = Mockito.mock(SecurityInfo.class);
Mockito.when(securityInfoMock.getServerPrincipal())
.thenReturn(HBaseKerberosUtils.KRB_PRINCIPAL);
