diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java index 38cc2cb..460ecad 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/RegistryTestHelper.java @@ -326,48 +326,6 @@ public static LoginContext logout(LoginContext login) { } /** - * Exec the native ktutil to list the keys - * (primarily to verify that the generated keytabs are compatible). - * This operation is not executed on windows. On other platforms - * it requires ktutil to be installed and on the path - *
-   *   ktutil --keytab=target/kdc/zookeeper.keytab list --keys
-   * 
- * @param keytab keytab to list - * @throws IOException on any execution problem, including the executable - * being missing - */ - public static String ktList(File keytab) throws IOException { - if (!Shell.WINDOWS) { - String path = keytab.getAbsolutePath(); - String out = Shell.execCommand( - KTUTIL, - "--keytab=" + path, - "list", - "--keys" - ); - LOG.info("Listing of keytab {}:\n{}\n", path, out); - return out; - } - return ""; - } - - /** - * Perform a robust ktutils -l ... catches and ignores - * exceptions, otherwise the output is logged. - * @param keytab keytab to list - * @return the result of the operation, or "" on any problem - */ - public static String ktListRobust(File keytab) { - try { - return ktList(keytab); - } catch (IOException e) { - // probably not on the path - return ""; - } - } - - /** * Login via a UGI. Requres UGI to have been set up * @param user username * @param keytab keytab to list diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java index ab9d490..b1ea037 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-registry/src/test/java/org/apache/hadoop/registry/secure/TestSecureLogins.java @@ -57,19 +57,6 @@ LoggerFactory.getLogger(TestSecureLogins.class); @Test - public void testZKinKeytab() throws Throwable { - Assume.assumeTrue(!Shell.WINDOWS); - try { - String listing = ktList(keytab_zk); - assertTrue("no " + ZOOKEEPER_LOCALHOST + " in " + listing, - listing.contains(ZOOKEEPER_LOCALHOST)); - } catch (IOException e) { - LOG.debug(KTUTIL + " failure: {}", e, e); - Assume.assumeTrue("Failed to run "+ KTUTIL+": " + e, false ); - } - } - - @Test public void testHasRealm() throws Throwable { assertNotNull(getRealm()); LOG.info("ZK principal = {}", getPrincipalAndRealm(ZOOKEEPER_LOCALHOST));