FALCON-1273 ProcessLateRerunTest still using root directory. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/77830c17 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/77830c17 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/77830c17 Branch: refs/heads/master Commit: 77830c17ff42b76ac233239949d59273f41cadec Parents: edddc07 Author: Ruslan Ostafiychuk <[email protected]> Authored: Mon Jun 15 16:43:57 2015 +0300 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Mon Jun 15 16:43:57 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 2 ++ .../falcon/regression/ProcessLateRerunTest.java | 15 +++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/77830c17/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 8e42755..0e57e6d 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -351,6 +351,8 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1273 ProcessLateRerunTest still using root directory (Raghav Kumar Gautam via Ruslan Ostafiychuk) + FALCON-1272 InstanceParamTest still using root directory (Raghav Kumar Gautam via Ruslan Ostafiychuk) FALCON-1269 Update InstancePageTest and other after UI changes (Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/77830c17/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java index aef32bf..aa9bdd5 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java @@ -46,7 +46,10 @@ public class ProcessLateRerunTest extends BaseTestClass { private ColoHelper cluster1 = servers.get(0); private OozieClient cluster1OC = serverOC.get(0); private FileSystem cluster1FS = serverFS.get(0); - private String aggregateWorkflowDir = cleanAndGetTestDir() + "/aggregator"; + private String baseTestHDFSDir = cleanAndGetTestDir(); + private String aggregateWorkflowDir = baseTestHDFSDir + "/aggregator"; + private String feedInputPath = baseTestHDFSDir + "/input" + MINUTE_DATE_PATTERN; + private String feedOutputPath = baseTestHDFSDir + "/output-data" + MINUTE_DATE_PATTERN; private static final Logger LOGGER = Logger.getLogger(ProcessLateRerunTest.class); @BeforeClass(alwaysRun = true) @@ -57,11 +60,11 @@ public class ProcessLateRerunTest extends BaseTestClass { @BeforeMethod(alwaysRun = true) public void setUp() throws Exception { Bundle bundle = BundleUtil.readLateDataBundle(); - for (int i = 0; i < 1; i++) { - bundles[i] = new Bundle(bundle, servers.get(i)); - bundles[i].generateUniqueBundle(this); - bundles[i].setProcessWorkflow(aggregateWorkflowDir); - } + bundles[0] = new Bundle(bundle, servers.get(0)); + bundles[0].generateUniqueBundle(this); + bundles[0].setProcessWorkflow(aggregateWorkflowDir); + bundles[0].setInputFeedDataPath(feedInputPath); + bundles[0].setOutputFeedLocationData(feedOutputPath); } @AfterMethod(alwaysRun = true)
