This is an automated email from the ASF dual-hosted git repository. adoroszlai pushed a commit to branch branch-2.7 in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/branch-2.7 by this push: new 79414c3 AMBARI-23811. TimelineMetricsFilterTest fails if dir name contains @ due to AMBARI-24066 (#2032) 79414c3 is described below commit 79414c352647b03bffddfce8e3b64a5c97204aa5 Author: Doroszlai, Attila <6454655+adorosz...@users.noreply.github.com> AuthorDate: Fri Aug 10 23:19:58 2018 +0200 AMBARI-23811. TimelineMetricsFilterTest fails if dir name contains @ due to AMBARI-24066 (#2032) --- .../metrics/core/timeline/TimelineMetricsFilterTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java index 70b47c7..d903137 100644 --- a/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java +++ b/ambari-metrics/ambari-metrics-timelineservice/src/test/java/org/apache/ambari/metrics/core/timeline/TimelineMetricsFilterTest.java @@ -27,7 +27,6 @@ import org.easymock.EasyMock; import org.junit.Test; import java.net.URISyntaxException; -import java.net.URL; import java.util.HashSet; import java.util.Set; @@ -91,9 +90,7 @@ public class TimelineMetricsFilterTest { expect(configuration.getMetricsConf()).andReturn(metricsConf).once(); replay(configuration); - URL fileUrl = ClassLoader.getSystemResource("test_data/metric_blacklist.dat"); - - metricsConf.set("timeline.metrics.blacklist.file", fileUrl.getPath()); + metricsConf.set("timeline.metrics.blacklist.file", getTestBlacklistFilePath()); TimelineMetricsFilter.initializeMetricFilter(configuration); TimelineMetric timelineMetric = new TimelineMetric(); @@ -183,8 +180,7 @@ public class TimelineMetricsFilterTest { metricsConf.set("timeline.metrics.apps.whitelist", "namenode,nimbus"); metricsConf.set("timeline.metrics.apps.blacklist", "datanode,kafka_broker"); metricsConf.set("timeline.metrics.whitelist.file", getTestWhitelistFilePath()); - URL fileUrl2 = ClassLoader.getSystemResource("test_data/metric_blacklist.dat"); - metricsConf.set("timeline.metrics.blacklist.file", fileUrl2.getPath()); + metricsConf.set("timeline.metrics.blacklist.file", getTestBlacklistFilePath()); expect(configuration.getMetricsConf()).andReturn(metricsConf).once(); Set<String> whitelist = new HashSet<>(); @@ -256,4 +252,8 @@ public class TimelineMetricsFilterTest { private static String getTestWhitelistFilePath() throws URISyntaxException { return ClassLoader.getSystemResource("test_data/metric_whitelist.dat").toURI().getPath(); } + + private static String getTestBlacklistFilePath() throws URISyntaxException { + return ClassLoader.getSystemResource("test_data/metric_blacklist.dat").toURI().getPath(); + } }