You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2017/04/19 05:42:35 UTC
hive git commit: HIVE-15535 : Flaky test :
TestHS2HttpServer.testContextRootUrlRewrite (Barna Zsombor Klara via Ashutosh
Chauhan)
Repository: hive
Updated Branches:
refs/heads/master 2cab4ac83 -> efc2a5e18
HIVE-15535 : Flaky test : TestHS2HttpServer.testContextRootUrlRewrite (Barna Zsombor Klara via Ashutosh Chauhan)
Signed-off-by: Ashutosh Chauhan <ha...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hive/repo
Commit: http://git-wip-us.apache.org/repos/asf/hive/commit/efc2a5e1
Tree: http://git-wip-us.apache.org/repos/asf/hive/tree/efc2a5e1
Diff: http://git-wip-us.apache.org/repos/asf/hive/diff/efc2a5e1
Branch: refs/heads/master
Commit: efc2a5e186b0c9d874a06344c8a08b7e38b77e4d
Parents: 2cab4ac
Author: Barna Zsombor Klara <zs...@cloudera.com>
Authored: Tue Apr 18 22:36:56 2017 -0700
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Tue Apr 18 22:36:56 2017 -0700
----------------------------------------------------------------------
.../org/apache/hive/service/server/TestHS2HttpServer.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hive/blob/efc2a5e1/service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java
----------------------------------------------------------------------
diff --git a/service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java b/service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java
index 663a266..8a1f129 100644
--- a/service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java
+++ b/service/src/test/org/apache/hive/service/server/TestHS2HttpServer.java
@@ -90,7 +90,7 @@ public class TestHS2HttpServer {
@Test
public void testContextRootUrlRewrite() throws Exception {
- String datePattern = "[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]+\\[[0-9]+]";
+ String datePattern = "[a-zA-Z]{3} [a-zA-Z]{3} [0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}";
String dateMask = "xxxMasked_DateTime_xxx";
String baseURL = "http://localhost:" + webUIPort + "/";
String contextRootContent = getURLResponseAsString(baseURL);
@@ -98,8 +98,9 @@ public class TestHS2HttpServer {
String jspUrl = "http://localhost:" + webUIPort + "/hiveserver2.jsp";
String jspContent = getURLResponseAsString(jspUrl);
- Assert.assertEquals(contextRootContent.replaceAll(datePattern, dateMask),
- jspContent.replaceAll(datePattern, dateMask));
+ String expected = contextRootContent.replaceAll(datePattern, dateMask);
+ String actual = jspContent.replaceAll(datePattern, dateMask);
+ Assert.assertEquals(expected, actual);
}
@Test