falcon-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From samar...@apache.org
Subject [2/2] git commit: additional patch for falcon 564 fix pom files to make falcon-regression a module and minor update
Date Fri, 08 Aug 2014 04:37:56 GMT
additional patch for falcon 564 fix pom files to make falcon-regression a module and minor
update


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

Branch: refs/heads/master
Commit: 5cb6afafac20b5ee32a5e6946b51998418894961
Parents: 993534d
Author: Samarth Gupta <samarth.gupta@inmobi.com>
Authored: Fri Aug 8 10:07:03 2014 +0530
Committer: Samarth Gupta <samarth.gupta@inmobi.com>
Committed: Fri Aug 8 10:07:03 2014 +0530

----------------------------------------------------------------------
 .../org/apache/falcon/regression/core/bundle/Bundle.java     | 8 ++++++--
 falcon-regression/pom.xml                                    | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/5cb6afaf/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
index 5be1730..57c7292 100644
--- a/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
+++ b/falcon-regression/merlin-core/src/main/java/org/apache/falcon/regression/core/bundle/Bundle.java
@@ -77,7 +77,7 @@ public class Bundle {
     private List<String> dataSets;
     private String processData;
 
-    public void submitFeed() throws Exception {
+    public void submitFeed() throws URISyntaxException, IOException, AuthenticationException,
JAXBException {
         submitClusters(prismHelper);
 
         AssertUtil.assertSucceeded(
@@ -110,12 +110,16 @@ public class Bundle {
 
     public ServiceResponse submitProcess(boolean shouldSucceed) throws JAXBException,
         IOException, URISyntaxException, AuthenticationException {
-        submitAndScheduleAllFeeds();
+        submitClusters(prismHelper);
+        submitFeeds(prismHelper);
         ServiceResponse r = prismHelper.getProcessHelper().submitEntity(URLS.SUBMIT_URL,
             processData);
         if (shouldSucceed) {
             AssertUtil.assertSucceeded(r);
         }
+        else {
+            AssertUtil.assertFailed(r);
+        }
         return r;
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/5cb6afaf/falcon-regression/pom.xml
----------------------------------------------------------------------
diff --git a/falcon-regression/pom.xml b/falcon-regression/pom.xml
index ad42dcf..e5bb31a 100644
--- a/falcon-regression/pom.xml
+++ b/falcon-regression/pom.xml
@@ -39,11 +39,17 @@
         <module>merlin</module>
     </modules>
 
+    <properties>
+        <oozie.version>3.2.2</oozie.version>
+        <hive.version>0.13.1</hive.version>
+    </properties>
+
     <profiles>
         <profile>
             <id>hadoop-1</id>
             <properties>
                 <hadoop1.version>0.20.2-cdh3u3</hadoop1.version>
+                <hive.version>0.12.0</hive.version>
             </properties>
             <dependencyManagement>
                 <dependencies>


Mime
View raw message