tez-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jeag...@apache.org
Subject tez git commit: TEZ-3947. TestATSHistoryWithACLs fails with Hadoop3 and Jersey 1.19 (Eric Wohlstadter via jeagles)
Date Fri, 01 Jun 2018 23:46:53 GMT
Repository: tez
Updated Branches:
  refs/heads/branch-0.9 c369ba659 -> fd748fe20


TEZ-3947. TestATSHistoryWithACLs fails with Hadoop3 and Jersey 1.19 (Eric Wohlstadter via
jeagles)

(cherry picked from commit c6a09a1ff83b2dfd50893be2fe9b1db32cc928b1)


Project: http://git-wip-us.apache.org/repos/asf/tez/repo
Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/fd748fe2
Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/fd748fe2
Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/fd748fe2

Branch: refs/heads/branch-0.9
Commit: fd748fe20d3c033d0e15a658b70829785e9aa573
Parents: c369ba6
Author: Jonathan Eagles <jeagles@yahoo-inc.com>
Authored: Fri Jun 1 18:42:24 2018 -0500
Committer: Jonathan Eagles <jeagles@yahoo-inc.com>
Committed: Fri Jun 1 18:43:19 2018 -0500

----------------------------------------------------------------------
 .../apache/tez/dag/history/ats/acls/TestATSHistoryWithACLs.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/fd748fe2/tez-plugins/tez-yarn-timeline-history-with-acls/src/test/java/org/apache/tez/dag/history/ats/acls/TestATSHistoryWithACLs.java
----------------------------------------------------------------------
diff --git a/tez-plugins/tez-yarn-timeline-history-with-acls/src/test/java/org/apache/tez/dag/history/ats/acls/TestATSHistoryWithACLs.java
b/tez-plugins/tez-yarn-timeline-history-with-acls/src/test/java/org/apache/tez/dag/history/ats/acls/TestATSHistoryWithACLs.java
index 8e5c95c..4b5702e 100644
--- a/tez-plugins/tez-yarn-timeline-history-with-acls/src/test/java/org/apache/tez/dag/history/ats/acls/TestATSHistoryWithACLs.java
+++ b/tez-plugins/tez-yarn-timeline-history-with-acls/src/test/java/org/apache/tez/dag/history/ats/acls/TestATSHistoryWithACLs.java
@@ -147,7 +147,7 @@ public class TestATSHistoryWithACLs {
     ClientResponse response = resource.accept(MediaType.APPLICATION_JSON)
         .get(ClientResponse.class);
     assertEquals(200, response.getStatus());
-    assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
+    assertTrue(MediaType.APPLICATION_JSON_TYPE.isCompatible(response.getType()));
 
     K entity = response.getEntity(clazz);
     assertNotNull(entity);
@@ -458,7 +458,7 @@ public class TestATSHistoryWithACLs {
     ClientResponse response = resource.accept(MediaType.APPLICATION_JSON)
         .get(ClientResponse.class);
     assertEquals(200, response.getStatus());
-    assertEquals(MediaType.APPLICATION_JSON_TYPE, response.getType());
+    assertTrue(MediaType.APPLICATION_JSON_TYPE.isCompatible(response.getType()));
     TimelineEntity entity = response.getEntity(TimelineEntity.class);
     assertEquals(entity.getEntityType(), "TEZ_DAG_ID");
     assertEquals(entity.getEvents().get(0).getEventType(), HistoryEventType.DAG_SUBMITTED.toString());


Mime
View raw message