commit 4643f988a5e0ce2b9749e6365edea3a16482de86
author Sun Dapeng <sdp@apache.org> Tue Mar 22 18:40:15 2016 +0800
committer Sun Dapeng <sdp@apache.org> Tue Mar 22 18:40:15 2016 +0800
tree 3f6571e8c3531584275fbab32e60c8fc64e350c2
parent 5720b64d277417e511bfe230f260503016f7b7cb

SENTRY-1157: Fix Unit Tests TestAclsCrud&TestAuthorize failed (Dapeng Sun, reviewed by Colin Ma)

sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java

diff --git a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
index 85e7d21..2a3b317 100644
--- a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
+++ b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/KafkaTestServer.java
@@ -39,10 +39,10 @@
     private File sentrySitePath = null;
 
     public KafkaTestServer(File sentrySitePath) throws Exception {
-        this.zkPort = TestUtils.getFreePort();
-        this.kafkaPort = TestUtils.getFreePort();
         this.sentrySitePath = sentrySitePath;
+        this.zkPort = TestUtils.getFreePort();
         createZkServer();
+        this.kafkaPort = TestUtils.getFreePort();
         createKafkaServer();
     }
 

sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/TestUtils.java

diff --git a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/TestUtils.java b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/TestUtils.java
index dda4047..5d36082 100644
--- a/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/TestUtils.java
+++ b/sentry-tests/sentry-tests-kafka/src/main/java/org/apache/sentry/tests/e2e/kafka/TestUtils.java
@@ -23,7 +23,9 @@
     public static int getFreePort() throws IOException {
         synchronized (TestUtils.class) {
             ServerSocket serverSocket = new ServerSocket(0);
-            return serverSocket.getLocalPort();
+            int port = serverSocket.getLocalPort();
+            serverSocket.close();
+            return port;
         }
     }
 }