diff --git hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java index bf05ba91650edf40c59382adae66c79ff86e5d4d..797dd8825ce451b394b6677c99dd962787cac91c 100644 --- hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java +++ hcatalog/webhcat/svr/src/test/java/org/apache/hive/hcatalog/templeton/TestWebHCatE2e.java @@ -94,7 +94,11 @@ public void getStatus() throws IOException { LOG.debug("+getStatus()"); MethodCallRetVal p = doHttpCall(templetonBaseUrl + "/status", HTTP_METHOD_TYPE.GET); Assert.assertEquals(p.getAssertMsg(), HttpStatus.OK_200, p.httpStatusCode); - Assert.assertEquals(p.getAssertMsg(), "{\"status\":\"ok\",\"version\":\"v1\"}", p.responseBody); + if (!System.getProperty("java.version").startsWith("1.8")) { + Assert.assertEquals(p.getAssertMsg(), "{\"status\":\"ok\",\"version\":\"v1\"}", p.responseBody); + } else { + Assert.assertEquals(p.getAssertMsg(), "{\"version\":\"v1\",\"status\":\"ok\"}", p.responseBody); + } LOG.debug("-getStatus()"); } @Ignore("not ready due to HIVE-4824")