You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/07/10 17:01:38 UTC
ranger git commit: RANGER-1683 - Fix the failing Kerberos tests on
Jenkins
Repository: ranger
Updated Branches:
refs/heads/master d592d3fa2 -> caf7e9b86
RANGER-1683 - Fix the failing Kerberos tests on Jenkins
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/caf7e9b8
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/caf7e9b8
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/caf7e9b8
Branch: refs/heads/master
Commit: caf7e9b86ece776de465a1961f89a918ba4cbef7
Parents: d592d3f
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 10 15:35:07 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 10 18:01:14 2017 +0100
----------------------------------------------------------------------
.../kafka/authorizer/KafkaRangerAuthorizerGSSTest.java | 10 +++-------
pom.xml | 2 +-
2 files changed, 4 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/caf7e9b8/plugin-kafka/src/test/java/org/apache/ranger/authorization/kafka/authorizer/KafkaRangerAuthorizerGSSTest.java
----------------------------------------------------------------------
diff --git a/plugin-kafka/src/test/java/org/apache/ranger/authorization/kafka/authorizer/KafkaRangerAuthorizerGSSTest.java b/plugin-kafka/src/test/java/org/apache/ranger/authorization/kafka/authorizer/KafkaRangerAuthorizerGSSTest.java
index d072a6f..4ea39ed 100644
--- a/plugin-kafka/src/test/java/org/apache/ranger/authorization/kafka/authorizer/KafkaRangerAuthorizerGSSTest.java
+++ b/plugin-kafka/src/test/java/org/apache/ranger/authorization/kafka/authorizer/KafkaRangerAuthorizerGSSTest.java
@@ -18,7 +18,6 @@
package org.apache.ranger.authorization.kafka.authorizer;
import java.io.File;
-import java.net.InetAddress;
import java.net.ServerSocket;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileSystems;
@@ -85,13 +84,11 @@ public class KafkaRangerAuthorizerGSSTest {
configureKerby(basedir);
- String address = InetAddress.getLocalHost().getHostAddress();
-
// JAAS Config file - We need to point to the correct keytab files
Path path = FileSystems.getDefault().getPath(basedir, "/src/test/resources/kafka_kerberos.jaas");
String content = new String(Files.readAllBytes(path), StandardCharsets.UTF_8);
content = content.replaceAll("<basedir>", basedir);
- content = content.replaceAll("zookeeper/localhost", "zookeeper/" + address);
+ //content = content.replaceAll("zookeeper/localhost", "zookeeper/" + address);
Path path2 = FileSystems.getDefault().getPath(basedir, "/target/test-classes/kafka_kerberos.jaas");
Files.write(path2, content.getBytes(StandardCharsets.UTF_8));
@@ -104,7 +101,7 @@ public class KafkaRangerAuthorizerGSSTest {
zookeeperProperties.put("requireClientAuthScheme", "sasl");
zookeeperProperties.put("jaasLoginRenew", "3600000");
- InstanceSpec instanceSpec = new InstanceSpec(null, -1, -1, -1, true, 1,-1, -1, zookeeperProperties);
+ InstanceSpec instanceSpec = new InstanceSpec(null, -1, -1, -1, true, 1,-1, -1, zookeeperProperties, "localhost");
zkServer = new TestingServer(instanceSpec, true);
@@ -163,8 +160,7 @@ public class KafkaRangerAuthorizerGSSTest {
kerbyServer.init();
// Create principals
- String address = InetAddress.getLocalHost().getHostAddress();
- String zookeeper = "zookeeper/" + address + "@kafka.apache.org";
+ String zookeeper = "zookeeper/localhost@kafka.apache.org";
String kafka = "kafka/localhost@kafka.apache.org";
String client = "client@kafka.apache.org";
http://git-wip-us.apache.org/repos/asf/ranger/blob/caf7e9b8/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a4764ea..3fcc4aa 100644
--- a/pom.xml
+++ b/pom.xml
@@ -149,7 +149,7 @@
<commons.math.version>2.2</commons.math.version>
<commons.net.version>3.3</commons.net.version>
<commons.pool.version>1.6</commons.pool.version>
- <curator.test.version>2.11.1</curator.test.version>
+ <curator.test.version>2.12.0</curator.test.version>
<derby.version>10.11.1.1</derby.version>
<eclipse.jpa.version>2.5.2</eclipse.jpa.version>
<findbugs.plugin.version>3.0.3</findbugs.plugin.version>