You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ra...@apache.org on 2014/09/05 22:32:33 UTC
git commit: FALCON-679: Tests using ELbundle should stop writing to
root dir. Contributed by Raghav Kumar Gautam
Repository: incubator-falcon
Updated Branches:
refs/heads/FALCON-585 92e46b009 -> f82dee07e
FALCON-679: Tests using ELbundle should stop writing to root dir. Contributed by Raghav Kumar Gautam
Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/f82dee07
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/f82dee07
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/f82dee07
Branch: refs/heads/FALCON-585
Commit: f82dee07e05a043d22785e562783d27a206eefc8
Parents: 92e46b0
Author: Raghav Kumar Gautam <ra...@apache.org>
Authored: Fri Sep 5 13:32:06 2014 -0700
Committer: Raghav Kumar Gautam <ra...@apache.org>
Committed: Fri Sep 5 13:32:06 2014 -0700
----------------------------------------------------------------------
.../apache/falcon/regression/core/util/BundleUtil.java | 5 +++--
.../apache/falcon/regression/AuthorizationTest.java | 2 +-
.../falcon/regression/ELExp_FutureAndLatestTest.java | 13 ++++++++-----
.../apache/falcon/regression/ELValidationsTest.java | 2 +-
.../falcon/regression/EmbeddedPigScriptTest.java | 4 ++--
.../falcon/regression/FeedClusterUpdateTest.java | 4 ++--
.../falcon/regression/FeedInstanceStatusTest.java | 2 +-
.../org/apache/falcon/regression/FeedResumeTest.java | 2 +-
.../org/apache/falcon/regression/FeedScheduleTest.java | 2 +-
.../org/apache/falcon/regression/FeedStatusTest.java | 2 +-
.../falcon/regression/FeedSubmitAndScheduleTest.java | 2 +-
.../org/apache/falcon/regression/FeedSubmitTest.java | 2 +-
.../org/apache/falcon/regression/FeedSuspendTest.java | 2 +-
.../apache/falcon/regression/InstanceParamTest.java | 2 +-
.../apache/falcon/regression/InstanceSummaryTest.java | 13 +++++++------
.../apache/falcon/regression/NoOutputProcessTest.java | 6 ++++--
.../regression/ProcessInstanceColoMixedTest.java | 4 ++--
.../falcon/regression/ProcessInstanceKillsTest.java | 6 +++---
.../falcon/regression/ProcessInstanceRerunTest.java | 6 +++---
.../falcon/regression/ProcessInstanceResumeTest.java | 6 +++---
.../falcon/regression/ProcessInstanceRunningTest.java | 6 +++---
.../falcon/regression/ProcessInstanceStatusTest.java | 4 ++--
.../falcon/regression/ProcessInstanceSuspendTest.java | 6 +++---
.../apache/falcon/regression/ProcessLibPathTest.java | 4 ++--
.../apache/falcon/regression/hcat/HCatProcessTest.java | 6 ++++--
.../lineage/LineageApiProcessInstanceTest.java | 3 ++-
.../falcon/regression/lineage/LineageApiTest.java | 2 +-
.../falcon/regression/prism/EntityDryRunTest.java | 4 ++--
.../regression/prism/FeedDelayParallelTimeoutTest.java | 2 +-
.../regression/prism/NewPrismProcessUpdateTest.java | 2 +-
.../falcon/regression/prism/OptionalInputTest.java | 2 +-
.../regression/prism/PrismConcurrentRequestTest.java | 2 +-
.../falcon/regression/prism/PrismFeedDeleteTest.java | 2 +-
.../regression/prism/PrismFeedLateReplicationTest.java | 2 +-
.../prism/PrismFeedReplicationUpdateTest.java | 2 +-
.../falcon/regression/prism/PrismFeedSnSTest.java | 2 +-
.../falcon/regression/prism/PrismFeedSuspendTest.java | 2 +-
.../falcon/regression/prism/PrismFeedUpdateTest.java | 2 +-
.../falcon/regression/prism/PrismSubmitTest.java | 2 +-
.../prism/ProcessPartitionExpVariableTest.java | 2 +-
.../regression/prism/RescheduleKilledProcessTest.java | 2 +-
.../prism/RescheduleProcessInFinalStatesTest.java | 4 ++--
.../regression/prism/UpdateAtSpecificTimeTest.java | 2 +-
.../apache/falcon/regression/ui/LineageGraphTest.java | 4 +++-
.../org/apache/falcon/regression/ui/ProcessUITest.java | 3 ++-
45 files changed, 87 insertions(+), 74 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
index 6463af2..8803316 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/util/BundleUtil.java
@@ -55,8 +55,9 @@ public final class BundleUtil {
public static Bundle readRetentionBundle(String appPath, String testName) throws IOException {
return generateBundleFromTemplate("RetentionBundles", appPath, testName);
}
- public static Bundle readELBundle() throws IOException {
- return readBundleFromFolder("ELbundle");
+
+ public static Bundle readELBundle(String appPath, String testName) throws IOException {
+ return generateBundleFromTemplate("ELbundle", appPath, testName);
}
public static Bundle readHCatBundle(String appPath, String testName) throws IOException {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
index dd901fb..eb41808 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/AuthorizationTest.java
@@ -80,7 +80,7 @@ public class AuthorizationTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundle, cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExp_FutureAndLatestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExp_FutureAndLatestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExp_FutureAndLatestTest.java
index dcec150..d19daed 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExp_FutureAndLatestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExp_FutureAndLatestTest.java
@@ -52,6 +52,8 @@ public class ELExp_FutureAndLatestTest extends BaseTestClass {
OozieClient clusterOC = serverOC.get(0);
private String prefix;
private String baseTestDir = baseHDFSDir + "/ELExp_FutureAndLatest";
+ private String testInputDir = baseTestDir + "/input";
+ private String testOutputDir = baseTestDir + "/output";
private String aggregateWorkflowDir = baseTestDir + "/aggregator";
private static final Logger logger = Logger.getLogger(ELExp_FutureAndLatestTest.class);
@@ -60,15 +62,14 @@ public class ELExp_FutureAndLatestTest extends BaseTestClass {
logger.info("in @BeforeClass");
uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b.generateUniqueBundle();
b = new Bundle(b, cluster);
String startDate = TimeUtil.getTimeWrtSystemTime(-20);
String endDate = TimeUtil.getTimeWrtSystemTime(70);
- b.setInputFeedDataPath(
- baseTestDir + "/ELExp_latest/testData/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
+ b.setInputFeedDataPath(testInputDir + "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
b.setProcessWorkflow(aggregateWorkflowDir);
prefix = b.getFeedDataPathPrefix();
HadoopUtil.deleteDirIfExists(prefix.substring(1), clusterFS);
@@ -81,11 +82,13 @@ public class ELExp_FutureAndLatestTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(
- baseTestDir + "/ELExp_latest/testData/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
+ testInputDir + "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
+ bundles[0].setOutputFeedLocationData(
+ testOutputDir + "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
bundles[0].setInputFeedPeriodicity(5, TimeUnit.minutes);
bundles[0].setInputFeedValidity("2010-04-01T00:00Z", "2015-04-01T00:00Z");
String processStart = TimeUtil.getTimeWrtSystemTime(-3);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
index 5425360..5917a42 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELValidationsTest.java
@@ -129,7 +129,7 @@ public class ELValidationsTest extends BaseTestClass {
throws IOException, JAXBException, ParseException, URISyntaxException {
HadoopUtil.uploadDir(server.getClusterHelper().getHadoopFS(),
aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle = new Bundle(bundle, server.getPrefix());
bundle.generateUniqueBundle();
bundle.setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
index 1973bf8..6a9edd3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/EmbeddedPigScriptTest.java
@@ -77,7 +77,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
//copy pig script
HadoopUtil.uploadDir(clusterFS, pigScriptDir, OSUtil.RESOURCES + "pig");
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle.generateUniqueBundle();
bundle = new Bundle(bundle, cluster);
@@ -97,7 +97,7 @@ public class EmbeddedPigScriptTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(inputPath);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
index b06d8dd..e09c2fc 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedClusterUpdateTest.java
@@ -66,7 +66,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
@BeforeClass(alwaysRun = true)
public void createTestData() throws Exception {
uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 3; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
@@ -88,7 +88,7 @@ public class FeedClusterUpdateTest extends BaseTestClass {
public void setup(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 3; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
index ff227d6..d75afc4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceStatusTest.java
@@ -69,7 +69,7 @@ public class FeedInstanceStatusTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void testName(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 3; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
index 937f0a7..738d0d1 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedResumeTest.java
@@ -55,7 +55,7 @@ public class FeedResumeTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
index 148e3bf..7ae5da4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedScheduleTest.java
@@ -55,7 +55,7 @@ public class FeedScheduleTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
index 96af174..75def82 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedStatusTest.java
@@ -58,7 +58,7 @@ public class FeedStatusTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
index ab13dd4..a658102 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitAndScheduleTest.java
@@ -63,7 +63,7 @@ public class FeedSubmitAndScheduleTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
index a50c32a..a8795db 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSubmitTest.java
@@ -52,7 +52,7 @@ public class FeedSubmitTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
index 10bdddb..d324b64 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSuspendTest.java
@@ -55,7 +55,7 @@ public class FeedSuspendTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
index ad2e832..4e51a79 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceParamTest.java
@@ -81,7 +81,7 @@ public class InstanceParamTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- processBundle = BundleUtil.readELBundle();
+ processBundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
processBundle = new Bundle(processBundle, cluster1);
processBundle.generateUniqueBundle();
processBundle.setInputFeedDataPath(feedInputPath);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
index c541620..2e62360 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/InstanceSummaryTest.java
@@ -37,6 +37,7 @@ import org.apache.hadoop.security.authentication.client.AuthenticationException;
import org.apache.log4j.Logger;
import org.apache.oozie.client.CoordinatorAction.Status;
import org.apache.oozie.client.OozieClientException;
+import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterMethod;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.BeforeMethod;
@@ -53,6 +54,7 @@ import java.util.List;
this test currently provide minimum verification. More detailed test should
be added
*/
+@Test(groups = "embedded")
public class InstanceSummaryTest extends BaseTestClass {
//1. process : test summary single cluster few instance some future some past
@@ -66,6 +68,8 @@ public class InstanceSummaryTest extends BaseTestClass {
String baseTestHDFSDir = baseHDFSDir + "/InstanceSummaryTest";
String feedInputPath = baseTestHDFSDir +
"/testInputData/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
+ String feedOutputPath = baseTestHDFSDir +
+ "/testOutputData/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
String aggregateWorkflowDir = baseTestHDFSDir + "/aggregator";
String startTime;
String endTime;
@@ -95,10 +99,11 @@ public class InstanceSummaryTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
logger.info("test name: " + method.getName());
- processBundle = BundleUtil.readELBundle();
+ processBundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
processBundle = new Bundle(processBundle, cluster3);
processBundle.generateUniqueBundle();
processBundle.setInputFeedDataPath(feedInputPath);
+ processBundle.setOutputFeedLocationData(feedOutputPath);
processBundle.setProcessWorkflow(aggregateWorkflowDir);
for (int i = 0; i < 3; i++) {
@@ -302,10 +307,6 @@ public class InstanceSummaryTest extends BaseTestClass {
@AfterMethod(alwaysRun = true)
public void tearDown() throws IOException {
- processBundle.deleteBundle(prism);
- removeBundles();
- for (FileSystem fs : serverFS) {
- HadoopUtil.deleteDirIfExists(Util.getPathPrefix(feedInputPath), fs);
- }
+ removeBundles(processBundle);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
index df63483..86faf3b 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/NoOutputProcessTest.java
@@ -55,6 +55,7 @@ public class NoOutputProcessTest extends BaseTestClass {
OozieClient clusterOC = serverOC.get(0);
String testDir = baseHDFSDir + "/NoOutputProcessTest";
String inputPath = testDir + "/input/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
+ String outputPath = testDir + "/output/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
String aggregateWorkflowDir = testDir + "/aggregator";
private static final Logger logger = Logger.getLogger(NoOutputProcessTest.class);
@@ -64,7 +65,7 @@ public class NoOutputProcessTest extends BaseTestClass {
logger.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b.generateUniqueBundle();
b = new Bundle(b, cluster);
@@ -83,11 +84,12 @@ public class NoOutputProcessTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void testName(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
bundles[0].setInputFeedDataPath(inputPath);
+ bundles[0].setOutputFeedLocationData(outputPath);
bundles[0].setProcessValidity("2010-01-03T02:30Z", "2010-01-03T02:45Z");
bundles[0].setProcessPeriodicity(5, TimeUnit.minutes);
bundles[0].submitFeedsScheduleProcess(prism);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
index 278d973..e404567 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceColoMixedTest.java
@@ -75,9 +75,9 @@ public class ProcessInstanceColoMixedTest extends BaseTestClass {
LOGGER.info("test name: " + method.getName());
//get 3 unique bundles
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
- bundles[1] = BundleUtil.readELBundle();
+ bundles[1] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[1].generateUniqueBundle();
//generate bundles according to config files
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
index e7b2616..03fdd94 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceKillsTest.java
@@ -67,7 +67,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
LOGGER.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b.generateUniqueBundle();
b = new Bundle(b, cluster);
@@ -86,7 +86,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
@@ -328,7 +328,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
@AfterClass(alwaysRun = true)
public void deleteData() throws Exception {
LOGGER.info("in @AfterClass");
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
b.setInputFeedDataPath(feedInputPath);
String prefix = b.getFeedDataPathPrefix();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
index 119d871..44aff75 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRerunTest.java
@@ -68,7 +68,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
public void createTestData() throws Exception {
LOGGER.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
String startDate = "2010-01-02T00:40Z";
@@ -84,7 +84,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
@@ -311,7 +311,7 @@ public class ProcessInstanceRerunTest extends BaseTestClass {
@AfterClass(alwaysRun = true)
public void deleteData() throws Exception {
LOGGER.info("in @AfterClass");
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
b.setInputFeedDataPath(feedInputPath);
String prefix = b.getFeedDataPathPrefix();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
index 246a41e..57b7d65 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceResumeTest.java
@@ -65,7 +65,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
public void createTestData() throws Exception {
LOGGER.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
String startDate = "2010-01-01T23:20Z";
String endDate = "2010-01-02T01:40Z";
@@ -80,7 +80,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("setup " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
@@ -367,7 +367,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
public void deleteData() throws Exception {
LOGGER.info("in @AfterClass");
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
b.setInputFeedDataPath(feedInputPath);
String prefix = b.getFeedDataPathPrefix();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
index 7e39ea2..422c6b3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceRunningTest.java
@@ -68,7 +68,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
LOGGER.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle.generateUniqueBundle();
bundle = new Bundle(bundle, cluster);
@@ -86,7 +86,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
@@ -210,7 +210,7 @@ public class ProcessInstanceRunningTest extends BaseTestClass {
@AfterClass(alwaysRun = true)
public void deleteData() throws Exception {
LOGGER.info("in @AfterClass");
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
b.setInputFeedDataPath(feedInputPath);
String prefix = b.getFeedDataPathPrefix();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
index 1c4f153..4f06501 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceStatusTest.java
@@ -78,7 +78,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle.generateUniqueBundle();
bundle = new Bundle(bundle, cluster);
@@ -98,7 +98,7 @@ public class ProcessInstanceStatusTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
index cbf5ef9..4cbaf7d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessInstanceSuspendTest.java
@@ -70,7 +70,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
LOGGER.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle = new Bundle(bundle, cluster);
String startDate = "2010-01-01T23:40Z";
String endDate = "2010-01-02T01:40Z";
@@ -85,7 +85,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
@@ -316,7 +316,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
@AfterClass(alwaysRun = true)
public void deleteData() throws Exception {
LOGGER.info("in @AfterClass");
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle = new Bundle(bundle, cluster);
bundle.setInputFeedDataPath(feedInputPath);
String prefix = bundle.getFeedDataPathPrefix();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
index fc8e4a8..b64fca4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathTest.java
@@ -60,7 +60,7 @@ public class ProcessLibPathTest extends BaseTestClass {
//common lib for both test cases
HadoopUtil.uploadDir(clusterFS, testLibDir, OSUtil.RESOURCES_OOZIE + "lib");
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b.generateUniqueBundle();
b = new Bundle(b, cluster);
@@ -80,7 +80,7 @@ public class ProcessLibPathTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void testName(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(baseHDFSDir + "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
index d62ddde..3244dc9 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatProcessTest.java
@@ -522,7 +522,8 @@ public class HCatProcessTest extends BaseTestClass {
bundles[0].setInputFeedValidity(startDate, endDate);
//
- String nonHCatFeed = BundleUtil.readELBundle().getOutputFeedFromBundle();
+ String nonHCatFeed = BundleUtil.readELBundle(
+ baseAppHDFSDir, this.getClass().getSimpleName()).getOutputFeedFromBundle();
final String outputFeedName = bundles[0].getOutputFeedNameFromBundle();
nonHCatFeed = Util.setFeedName(nonHCatFeed, outputFeedName);
final List<String> clusterNames = bundles[0].getClusterNames();
@@ -575,7 +576,8 @@ public class HCatProcessTest extends BaseTestClass {
.location(outputHDFSDir)
.build());
- String nonHCatFeed = BundleUtil.readELBundle().getInputFeedFromBundle();
+ String nonHCatFeed = BundleUtil.readELBundle(
+ baseAppHDFSDir, this.getClass().getSimpleName()).getInputFeedFromBundle();
final String inputFeedName = bundles[0].getInputFeedNameFromBundle();
nonHCatFeed = Util.setFeedName(nonHCatFeed, inputFeedName);
final List<String> clusterNames = bundles[0].getClusterNames();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
index c65526a..1ef35ce 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiProcessInstanceTest.java
@@ -79,7 +79,8 @@ public class LineageApiProcessInstanceTest extends BaseTestClass {
HadoopUtil.deleteDirIfExists(baseTestHDFSDir, clusterFS);
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- bundles[0] = new Bundle(BundleUtil.readELBundle(), cluster);
+ bundles[0] = new Bundle(
+ BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName()), cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
index f7f95da..53327eb 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/LineageApiTest.java
@@ -83,7 +83,7 @@ public class LineageApiTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true, firstTimeOnly = true)
public void setUp() throws Exception {
CleanupUtil.cleanAllEntities(prism);
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundle.generateUniqueBundle();
bundles[0] = new Bundle(bundle, cluster);
final List<String> clusterStrings = bundles[0].getClusters();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
index 9bed6f2..f27aca1 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/EntityDryRunTest.java
@@ -60,7 +60,7 @@ public class EntityDryRunTest extends BaseTestClass {
public void createTestData() throws Exception {
LOGGER.info("in @BeforeClass");
HadoopUtil.uploadDir(clusterFS, aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b = new Bundle(b, cluster);
b.setInputFeedDataPath(feedInputPath);
}
@@ -68,7 +68,7 @@ public class EntityDryRunTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
LOGGER.info("setup " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(feedInputPath);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
index f0d5a50..f5bee03 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedDelayParallelTimeoutTest.java
@@ -56,7 +56,7 @@ public class FeedDelayParallelTimeoutTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundle, cluster1);
bundles[1] = new Bundle(bundle, cluster2);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
index f4553df..8dbf973 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/NewPrismProcessUpdateTest.java
@@ -1489,7 +1489,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
public void
updateProcessWorkflowXml() throws URISyntaxException, JAXBException,
IOException, OozieClientException, AuthenticationException {
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
HadoopFileEditor hadoopFileEditor = null;
try {
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java
index 4b8fe0a..3965e2d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/OptionalInputTest.java
@@ -61,7 +61,7 @@ public class OptionalInputTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
index 1ef97ed..45997bf 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismConcurrentRequestTest.java
@@ -59,7 +59,7 @@ public class PrismConcurrentRequestTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setup(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0].generateUniqueBundle();
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
index f4dfe78..9974062 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedDeleteTest.java
@@ -68,7 +68,7 @@ public class PrismFeedDeleteTest extends BaseTestClass {
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
restartRequired = false;
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundle, cluster1);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
index 77d07af..b5c8cb2 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedLateReplicationTest.java
@@ -67,7 +67,7 @@ public class PrismFeedLateReplicationTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 3; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
index af4243b..9b7f8fe 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationUpdateTest.java
@@ -74,7 +74,7 @@ public class PrismFeedReplicationUpdateTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 3; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
index e9a9cf4..f14e1cc 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java
@@ -64,7 +64,7 @@ public class PrismFeedSnSTest extends BaseTestClass {
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
restartRequired = false;
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 2; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
index d6dbaa5..1fd2262 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedSuspendTest.java
@@ -54,7 +54,7 @@ public class PrismFeedSuspendTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 2; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
index b6bf6d6..a28d7b2 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedUpdateTest.java
@@ -74,7 +74,7 @@ public class PrismFeedUpdateTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- Bundle bundle = BundleUtil.readELBundle();
+ Bundle bundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
for (int i = 0; i < 2; i++) {
bundles[i] = new Bundle(bundle, servers.get(i));
bundles[i].generateUniqueBundle();
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
index 8f2b160..9038dac 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismSubmitTest.java
@@ -59,7 +59,7 @@ public class PrismSubmitTest extends BaseTestClass {
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
restartRequired = false;
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster1);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java
index 5c3cf1a..ec17c86 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/ProcessPartitionExpVariableTest.java
@@ -66,7 +66,7 @@ public class ProcessPartitionExpVariableTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
index 2ba441c..0187142 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleKilledProcessTest.java
@@ -56,7 +56,7 @@ public class RescheduleKilledProcessTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
index a81475d..18e1c6c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RescheduleProcessInFinalStatesTest.java
@@ -63,7 +63,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
logger.info("in @BeforeClass");
uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- Bundle b = BundleUtil.readELBundle();
+ Bundle b = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
b.generateUniqueBundle();
b = new Bundle(b, cluster);
b.setProcessWorkflow(aggregateWorkflowDir);
@@ -84,7 +84,7 @@ public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
@BeforeMethod(alwaysRun = true)
public void setUp(Method method) throws Exception {
logger.info("test name: " + method.getName());
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setInputFeedDataPath(inputPath);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
index a017c79..0f190b7 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java
@@ -90,7 +90,7 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
bundles[1].generateUniqueBundle();
bundles[2].generateUniqueBundle();
- processBundle = BundleUtil.readELBundle();
+ processBundle = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
processBundle = new Bundle(processBundle, cluster_1);
processBundle.generateUniqueBundle();
processBundle.setProcessWorkflow(aggregateWorkflowDir);
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
index c62935e..b725b14 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/LineageGraphTest.java
@@ -64,6 +64,7 @@ public class LineageGraphTest extends BaseUITestClass {
private static final Logger logger = Logger.getLogger(LineageGraphTest.class);
String datePattern = "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}";
String feedInputPath = baseTestDir + "/input" + datePattern;
+ String feedOutputPath = baseTestDir + "/output" + datePattern;
private FileSystem clusterFS = serverFS.get(0);
private OozieClient clusterOC = serverOC.get(0);
private String processName = null;
@@ -82,7 +83,7 @@ public class LineageGraphTest extends BaseUITestClass {
throws IOException, JAXBException, URISyntaxException, AuthenticationException,
OozieClientException {
uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
@@ -96,6 +97,7 @@ public class LineageGraphTest extends BaseUITestClass {
bundles[0].setProcessConcurrency(5);
bundles[0].setInputFeedPeriodicity(1, Frequency.TimeUnit.minutes);
bundles[0].setInputFeedDataPath(feedInputPath);
+ bundles[0].setOutputFeedLocationData(feedInputPath);
bundles[0].setProcessInput("now(0,0)", String.format("now(0,%d)", inputEnd - 1));
/**provide necessary data for first 3 instances to run*/
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/f82dee07/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
index 356920c..6c9c27f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ui/ProcessUITest.java
@@ -82,7 +82,7 @@ public class ProcessUITest extends BaseUITestClass {
CleanupUtil.cleanAllEntities(prism);
uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE);
openBrowser();
- bundles[0] = BundleUtil.readELBundle();
+ bundles[0] = BundleUtil.readELBundle(baseAppHDFSDir, this.getClass().getSimpleName());
bundles[0] = new Bundle(bundles[0], cluster);
bundles[0].generateUniqueBundle();
bundles[0].setProcessWorkflow(aggregateWorkflowDir);
@@ -96,6 +96,7 @@ public class ProcessUITest extends BaseUITestClass {
bundles[0].setProcessConcurrency(5);
bundles[0].setInputFeedPeriodicity(1, Frequency.TimeUnit.minutes);
bundles[0].setInputFeedDataPath(feedInputPath + datePattern);
+ bundles[0].setOutputFeedLocationData(feedOutputPath + datePattern);
Process process = bundles[0].getProcessObject();
Inputs inputs = new Inputs();
Input input = new Input();