HBASE-13280 TestSecureRPC failed

This commit is contained in:
zhangduo 2015-03-19 21:46:15 +08:00
parent 6b411b5d00
commit 9e92e33629
3 changed files with 3 additions and 13 deletions

View File

@ -26,7 +26,6 @@ import static org.junit.Assert.assertSame;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;
@ -37,10 +36,6 @@ import org.apache.hadoop.fs.CommonConfigurationKeys;
import org.apache.hadoop.hbase.HBaseTestingUtility;
import org.apache.hadoop.hbase.HConstants;
import org.apache.hadoop.hbase.ServerName;
import org.apache.hadoop.hbase.testclassification.SmallTests;
import org.apache.hadoop.hbase.ipc.FifoRpcScheduler;
import org.apache.hadoop.hbase.ipc.RpcClient;
import org.apache.hadoop.hbase.ipc.RpcClientFactory;
import org.apache.hadoop.hbase.ipc.AsyncRpcClient;
import org.apache.hadoop.hbase.ipc.FifoRpcScheduler;
import org.apache.hadoop.hbase.ipc.RpcClient;
@ -75,7 +70,7 @@ public class TestSecureRPC {
private static MiniKdc KDC;
private static String HOST;
private static String HOST = "localhost";
private static String PRINCIPAL;
@ -85,7 +80,6 @@ public class TestSecureRPC {
conf.put(MiniKdc.DEBUG, true);
KDC = new MiniKdc(conf, new File(TEST_UTIL.getDataTestDir("kdc").toUri().getPath()));
KDC.start();
HOST = InetAddress.getLocalHost().getHostName();
PRINCIPAL = "hbase/" + HOST;
KDC.createPrincipal(KEYTAB_FILE, PRINCIPAL);
HBaseKerberosUtils.setKeytabFileForTesting(KEYTAB_FILE.getAbsolutePath());

View File

@ -28,7 +28,6 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.util.Properties;
import org.apache.hadoop.conf.Configuration;
@ -50,7 +49,7 @@ public class TestUsersOperationsWithSecureHadoop {
private static MiniKdc KDC;
private static String HOST;
private static String HOST = "localhost";
private static String PRINCIPAL;
@ -60,7 +59,6 @@ public class TestUsersOperationsWithSecureHadoop {
conf.put(MiniKdc.DEBUG, true);
KDC = new MiniKdc(conf, new File(TEST_UTIL.getDataTestDir("kdc").toUri().getPath()));
KDC.start();
HOST = InetAddress.getLocalHost().getHostName();
PRINCIPAL = "hbase/" + HOST;
KDC.createPrincipal(KEYTAB_FILE, PRINCIPAL);
HBaseKerberosUtils.setKeytabFileForTesting(KEYTAB_FILE.getAbsolutePath());

View File

@ -22,7 +22,6 @@ import static org.junit.Assert.assertTrue;
import java.io.File;
import java.io.IOException;
import java.net.InetAddress;
import java.util.Properties;
import org.apache.hadoop.hbase.HBaseTestingUtility;
@ -69,7 +68,7 @@ public class TestGenerateDelegationToken {
.getPath());
private static MiniKdc KDC;
private static String HOST;
private static String HOST = "localhost";
private static String USERNAME = System.getProperty("user.name");
@ -81,7 +80,6 @@ public class TestGenerateDelegationToken {
conf.put(MiniKdc.DEBUG, true);
KDC = new MiniKdc(conf, new File(TEST_UTIL.getDataTestDir("kdc").toUri().getPath()));
KDC.start();
HOST = InetAddress.getLocalHost().getHostName();
PRINCIPAL = USERNAME + "/" + HOST;
KDC.createPrincipal(KEYTAB_FILE, PRINCIPAL);
TEST_UTIL.getConfiguration().setBoolean("ipc.client.fallback-to-simple-auth-allowed", true);