svn commit: r1524441 - /hive/trunk/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java

[ha...@apache.org]

Author: hashutosh
Date: Wed Sep 18 15:09:20 2013
New Revision: 1524441

URL: http://svn.apache.org/r1524441
Log:
HIVE-5166 : TestWebHCatE2e is failing intermittently on trunk (Eugene Koifman via Ashutosh Chauhan)

Modified:
    hive/trunk/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java

Modified: hive/trunk/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java
URL: http://svn.apache.org/viewvc/hive/trunk/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java?rev=1524441&r1=1524440&r2=1524441&view=diff
==============================================================================
--- hive/trunk/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java (original)
+++ hive/trunk/hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java Wed Sep 18 15:09:20 2013
@@ -26,6 +26,7 @@ import org.apache.commons.httpclient.met
 import org.apache.commons.httpclient.methods.GetMethod;
 import org.apache.commons.httpclient.methods.PutMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
+import org.apache.hadoop.hive.metastore.MetaStoreUtils;
 import org.apache.hadoop.hive.ql.ErrorMsg;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
@@ -57,7 +58,7 @@ import java.util.Map;
 public class TestWebHCatE2e {
   private static final Logger LOG =
       LoggerFactory.getLogger(TestWebHCatE2e.class);
-  private static final String templetonBaseUrl =
+  private static String templetonBaseUrl =
       "http://localhost:50111/templeton/v1";
   private static final String username= "johndoe";
   private static final String ERROR_CODE = "errorCode";
@@ -65,8 +66,18 @@ public class TestWebHCatE2e {
   private static final String charSet = "UTF-8";
   @BeforeClass
   public static void startHebHcatInMem() {
-    templetonServer = new Main(new String[] {"-D" + AppConfig.UNIT_TEST_MODE + "=true"});
-    LOG.info("Starting Main");
+    int webhcatPort = 50111;
+    try {
+      //in case concurrent tests are running on the same machine
+      webhcatPort = MetaStoreUtils.findFreePort();
+    }
+    catch (IOException ex) {
+      LOG.warn("Unable to find free port; using default: " + webhcatPort);
+    }
+    templetonBaseUrl = templetonBaseUrl.replace("50111", Integer.toString(webhcatPort));
+    templetonServer = new Main(new String[] {"-D" + 
+            AppConfig.UNIT_TEST_MODE + "=true", "-D" + AppConfig.PORT + "=" + webhcatPort});
+    LOG.info("Starting Main; WebHCat using port: " + webhcatPort);
     templetonServer.run();
     LOG.info("Main started");
   }