Repository: tez Updated Branches: refs/heads/master 1e44ba768 -> c6a09a1ff
TEZ-3947. TestATSHistoryWithACLs fails with Hadoop3 and Jersey 1.19 (Eric Wohlstadter via jeagles) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/c6a09a1f Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/c6a09a1f Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/c6a09a1f Branch: refs/heads/master Commit: c6a09a1ff83b2dfd50893be2fe9b1db32cc928b1 Parents: 1e44ba7 Author: Jonathan Eagles <[email protected]> Authored: Fri Jun 1 18:42:24 2018 -0500 Committer: Jonathan Eagles <[email protected]> Committed: Fri Jun 1 18:42:24 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/c6a09a1f/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());
