falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rag...@apache.org
Subject git commit: FALCON-680: Tests using LocalDC, impressionRC, updateBundle should stop using root dir. Contributed by Raghav Kumar Gautam
Date Tue, 09 Sep 2014 17:31:04 GMT
Repository: incubator-falcon
Updated Branches:
  refs/heads/FALCON-585 f82dee07e -> 1f9a27f96


FALCON-680: Tests using LocalDC, impressionRC, updateBundle should stop using 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/1f9a27f9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/1f9a27f9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/1f9a27f9

Branch: refs/heads/FALCON-585
Commit: 1f9a27f962a6e35cb83d289fa56bcb58601e23f6
Parents: f82dee0
Author: Raghav Kumar Gautam <raghav@apache.org>
Authored: Tue Sep 9 10:30:49 2014 -0700
Committer: Raghav Kumar Gautam <raghav@apache.org>
Committed: Tue Sep 9 10:30:49 2014 -0700

----------------------------------------------------------------------
 .../apache/falcon/regression/core/util/BundleUtil.java  | 12 ++++++------
 .../apache/falcon/regression/FeedReplicationTest.java   |  3 ++-
 .../falcon/regression/prism/FeedRetentionTest.java      |  6 ++++--
 .../regression/prism/NewPrismProcessUpdateTest.java     |  2 +-
 .../prism/PrismFeedReplicationPartitionExpTest.java     |  3 ++-
 .../regression/prism/UpdateAtSpecificTimeTest.java      |  3 ++-
 6 files changed, 17 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1f9a27f9/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 8803316..166fb3d 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
@@ -68,16 +68,16 @@ public final class BundleUtil {
         return generateBundleFromTemplate("hcat_2", appPath, testName);
     }
 
-    public static Bundle readLocalDCBundle() throws IOException {
-        return readBundleFromFolder("LocalDC_feedReplicaltion_BillingRC");
+    public static Bundle readLocalDCBundle(String appPath, String testName) throws IOException
{
+        return generateBundleFromTemplate("LocalDC_feedReplicaltion_BillingRC", appPath,
testName);
     }
 
-    public static Bundle readImpressionRCBundle() throws IOException {
-        return readBundleFromFolder("impressionRC");
+    public static Bundle readImpressionRCBundle(String appPath, String testName) throws IOException
{
+        return generateBundleFromTemplate("impressionRC", appPath, testName);
     }
 
-    public static Bundle readUpdateBundle() throws IOException {
-        return readBundleFromFolder("updateBundle");
+    public static Bundle readUpdateBundle(String appPath, String testName) throws IOException
{
+        return generateBundleFromTemplate("updateBundle", appPath, testName);
     }
 
     /** Generate a bundle from the template stored in a directory

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1f9a27f9/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
index 8b1dd0e..7e2aa4e 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedReplicationTest.java
@@ -82,7 +82,8 @@ public class FeedReplicationTest extends BaseTestClass {
     @BeforeMethod(alwaysRun = true)
     public void setUp(Method method) throws JAXBException, IOException {
         LOGGER.info("test name: " + method.getName());
-        Bundle bundle = BundleUtil.readLocalDCBundle();
+        Bundle bundle =
+            BundleUtil.readLocalDCBundle(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/1f9a27f9/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedRetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedRetentionTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedRetentionTest.java
index e0571b5..25a8789 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedRetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/FeedRetentionTest.java
@@ -70,12 +70,14 @@ public class FeedRetentionTest extends BaseTestClass {
     public void setUp(Method method) throws Exception {
         logger.info("test name: " + method.getName());
         //getImpressionRC bundle
-        bundles[0] = BundleUtil.readImpressionRCBundle();
+        bundles[0] =
+            BundleUtil.readImpressionRCBundle(baseAppHDFSDir, this.getClass().getSimpleName());
         bundles[0].generateUniqueBundle();
         bundles[0] = new Bundle(bundles[0], cluster1);
         bundles[0].setProcessWorkflow(impressionrcWorkflowDir);
 
-        bundles[1] = BundleUtil.readImpressionRCBundle();
+        bundles[1] =
+            BundleUtil.readImpressionRCBundle(baseAppHDFSDir, this.getClass().getSimpleName());
         bundles[1].generateUniqueBundle();
         bundles[1] = new Bundle(bundles[1], cluster2);
         bundles[1].setProcessWorkflow(impressionrcWorkflowDir);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1f9a27f9/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 8dbf973..26fd43e 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
@@ -88,7 +88,7 @@ public class NewPrismProcessUpdateTest extends BaseTestClass {
     @BeforeMethod(alwaysRun = true)
     public void testSetup(Method method) throws Exception {
         LOGGER.info("test name: " + method.getName());
-        Bundle b = BundleUtil.readUpdateBundle();
+        Bundle b = BundleUtil.readUpdateBundle(baseAppHDFSDir, this.getClass().getSimpleName());
         bundles[0] = new Bundle(b, cluster1);
         bundles[0].generateUniqueBundle();
         bundles[1] = new Bundle(b, cluster2);

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/1f9a27f9/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
index 83759b1..a126a5d 100755
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedReplicationPartitionExpTest.java
@@ -174,7 +174,8 @@ public class PrismFeedReplicationPartitionExpTest extends BaseTestClass
{
     @BeforeMethod(alwaysRun = true)
     public void testName(Method method) throws Exception {
         logger.info("test name: " + method.getName());
-        Bundle bundle = BundleUtil.readLocalDCBundle();
+        Bundle bundle =
+            BundleUtil.readLocalDCBundle(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/1f9a27f9/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 0f190b7..233c50f 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
@@ -81,7 +81,8 @@ public class UpdateAtSpecificTimeTest extends BaseTestClass {
     @BeforeMethod(alwaysRun = true)
     public void setup(Method method) throws IOException {
         logger.info("test name: " + method.getName());
-        Bundle bundle = BundleUtil.readLocalDCBundle();
+        Bundle bundle =
+            BundleUtil.readLocalDCBundle(baseAppHDFSDir, this.getClass().getSimpleName());
         bundles[0] = new Bundle(bundle, cluster_1);
         bundles[1] = new Bundle(bundle, cluster_2);
         bundles[2] = new Bundle(bundle, cluster_3);


Mime
View raw message