falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samar...@apache.org
Subject git commit: FALCON-567 contributed by Ruslan Ostafiychuk
Date Wed, 06 Aug 2014 05:41:52 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/master ad51ca03f -> 74e858b4f


FALCON-567 contributed by  Ruslan Ostafiychuk


Project: http://git-wip-us.apache.org/repos/asf/incubator-falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-falcon/commit/74e858b4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/74e858b4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/74e858b4

Branch: refs/heads/master
Commit: 74e858b4f60e379e5f1f819ba0e69d28f78fc8ef
Parents: ad51ca0
Author: Samarth Gupta <samarth.gupta@inmobi.com>
Authored: Wed Aug 6 11:05:11 2014 +0530
Committer: Samarth Gupta <samarth.gupta@inmobi.com>
Committed: Wed Aug 6 11:05:11 2014 +0530

----------------------------------------------------------------------
 .../java/org/apache/falcon/regression/ProcessLibPathTest.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/74e858b4/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 ef6860b..01e58c9 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
@@ -47,7 +47,8 @@ public class ProcessLibPathTest extends BaseTestClass {
 
     ColoHelper cluster = servers.get(0);
     FileSystem clusterFS = serverFS.get(0);
-    String testLibDir = baseHDFSDir + "/ProcessLibPath/TestLib";
+    String testDir = baseHDFSDir + "/ProcessLibPath";
+    String testLibDir = testDir + "/TestLib";
     private static final Logger logger = Logger.getLogger(ProcessLibPathTest.class);
 
     @BeforeClass(alwaysRun = true)
@@ -64,7 +65,7 @@ public class ProcessLibPathTest extends BaseTestClass {
         String startDate = "2010-01-01T22:00Z";
         String endDate = "2010-01-02T03:00Z";
 
-        b.setInputFeedDataPath(baseHDFSDir + "/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
+        b.setInputFeedDataPath(testDir + "/input/${YEAR}/${MONTH}/${DAY}/${HOUR}/${MINUTE}");
         String prefix = b.getFeedDataPathPrefix();
         HadoopUtil.deleteDirIfExists(prefix.substring(1), clusterFS);
 
@@ -105,6 +106,7 @@ public class ProcessLibPathTest extends BaseTestClass {
         String workflowDir = testLibDir + "/aggregatorLib1/";
         HadoopUtil.uploadDir(clusterFS, workflowDir, OSUtil.RESOURCES_OOZIE);
         HadoopUtil.deleteDirIfExists(workflowDir + "/lib", clusterFS);
+        bundles[0].setProcessWorkflow(workflowDir);
         logger.info("processData: " + Util.prettyPrintXml(bundles[0].getProcessData()));
         bundles[0].submitFeedsScheduleProcess(prism);
         InstanceUtil
@@ -123,6 +125,7 @@ public class ProcessLibPathTest extends BaseTestClass {
         HadoopUtil.recreateDir(clusterFS, workflowDir + "/lib");
         HadoopUtil.copyDataToFolder(clusterFS, workflowDir + "/lib",
             OSUtil.RESOURCES + "ivory-oozie-lib-0.1.jar");
+        bundles[0].setProcessWorkflow(workflowDir);
         logger.info("processData: " + Util.prettyPrintXml(bundles[0].getProcessData()));
         bundles[0].submitFeedsScheduleProcess(prism);
         InstanceUtil


Mime
View raw message