Repository: incubator-eagle Updated Branches: refs/heads/master 7976858ee -> aeec7f389
[MINOR] Remove field siteId and modify PowerMockIgnore - Remove field siteId and modify PowerMockIgnore. Author: r7raul1984 <tangji...@yhd.com> Closes #688 from r7raul1984/MINOR-mrjobparsertest. Project: http://git-wip-us.apache.org/repos/asf/incubator-eagle/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-eagle/commit/aeec7f38 Tree: http://git-wip-us.apache.org/repos/asf/incubator-eagle/tree/aeec7f38 Diff: http://git-wip-us.apache.org/repos/asf/incubator-eagle/diff/aeec7f38 Branch: refs/heads/master Commit: aeec7f389ec44bf0be0291f310a27d7d312ebc8e Parents: 7976858 Author: r7raul1984 <tangji...@yhd.com> Authored: Mon Nov 28 16:47:35 2016 +0800 Committer: wujinhu <wujinhu...@126.com> Committed: Mon Nov 28 16:47:35 2016 +0800 ---------------------------------------------------------------------- .../org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-eagle/blob/aeec7f38/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java ---------------------------------------------------------------------- diff --git a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java index 561d858..074c364 100644 --- a/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java +++ b/eagle-jpm/eagle-jpm-mr-running/src/test/java/org/apache/eagle/jpm/mr/running/parser/MRJobParserTest.java @@ -61,7 +61,7 @@ import static org.powermock.api.mockito.PowerMockito.mockStatic; @RunWith(PowerMockRunner.class) @PrepareForTest({InputStreamUtils.class, MRJobParser.class, URLConnectionUtils.class, Math.class, MRJobEntityCreationHandler.class}) -@PowerMockIgnore({"javax.*", "org.w3c.*", "com.sun.org.apache.xerces.*"}) +@PowerMockIgnore({"javax.*", "org.w3c.*", "com.sun.org.apache.xerces.*","org.apache.xerces.*"}) public class MRJobParserTest { private static final String ZK_JOB_PATH = "/apps/mr/running/sandbox/application_1479206441898_30784/job_1479206441898_30784"; private static final String ZK_APP_PATH = "/apps/mr/running/sandbox/application_1479206441898_30784"; @@ -72,7 +72,6 @@ public class MRJobParserTest { private static final String DATA_FROM_ZK = "{\"entityTags\":\"{\\\"jobName\\\":\\\"oozie:launcher:T=shell:W=wf_co_xxx_xxx_v3:A=extract_org_data:ID=0002383-161115184801730-oozie-oozi-W\\\",\\\"jobId\\\":\\\"job_1479206441898_30784\\\",\\\"site\\\":\\\"sandbox\\\",\\\"jobDefId\\\":\\\"eagletest\\\",\\\"jobType\\\":\\\"HIVE\\\",\\\"user\\\":\\\"xxx\\\",\\\"queue\\\":\\\"xxx\\\"}\",\"appInfo\":\"{\\\"applicationType\\\":\\\"MAPREDUCE\\\",\\\"startedTime\\\":\\\"1479328221694\\\",\\\"finalStatus\\\":\\\"UNDEFINED\\\",\\\"trackingUrl\\\":\\\"http:\\\\\\/\\\\\\/host.domain.com:8088\\\\\\/proxy\\\\\\/application_1479206441898_30784\\\\\\/\\\",\\\"runningContainers\\\":\\\"2\\\",\\\"trackingUI\\\":\\\"ApplicationMaster\\\",\\\"clusterId\\\":\\\"1479206441898\\\",\\\"amContainerLogs\\\":\\\"http:\\\\\\/\\\\\\/host.domain.com:8088\\\\\\/node\\\\\\/containerlogs\\\\\\/container_e11_1479206441898_30784_01_000001\\\\\\/xxx\\\",\\\"allocatedVCores\\\":\\\"2\\\",\\\"diagnostics\\\":\\\"\\\",\\\ "name\\\":\\\"oozie:launcher:T=shell:W=wf_co_xxx_xxx_v3:A=extract_org_data:ID=0002383-161115184801730-oozie-oozi-W\\\",\\\"progress\\\":\\\"95.0\\\",\\\"finishedTime\\\":\\\"0\\\",\\\"allocatedMB\\\":\\\"3072\\\",\\\"id\\\":\\\"application_1479206441898_30784\\\",\\\"state\\\":\\\"RUNNING\\\",\\\"amHostHttpAddress\\\":\\\"host.domain.com:8088\\\",\\\"user\\\":\\\"xxx\\\",\\\"queue\\\":\\\"xxx\\\",\\\"elapsedTime\\\":\\\"13367402\\\"}\"}"; private static TestingServer zk; private static String ZKROOT; - private static String siteId; private static MRRunningJobConfig mrRunningJobConfig; private static Config config = ConfigFactory.load(); private static CuratorFramework curator; @@ -84,7 +83,6 @@ public class MRJobParserTest { zk = new TestingServer(); curator = CuratorFrameworkFactory.newClient(zk.getConnectString(), new RetryOneTime(1)); mrRunningJobConfig = MRRunningJobConfig.newInstance(config); - siteId = mrRunningJobConfig.getEndpointConfig().site; mrRunningJobConfig.getZkStateConfig().zkQuorum = zk.getConnectString(); ZKROOT = mrRunningJobConfig.getZkStateConfig().zkRoot; OBJ_MAPPER.configure(JsonParser.Feature.ALLOW_NON_NUMERIC_NUMBERS, true);