You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by ro...@apache.org on 2014/09/14 13:44:28 UTC
[1/3] git commit: FALCON-716 PrismFeedSuspendTest tests retagged as
distributed. Contributed by Ruslan Ostafiychuk
Repository: incubator-falcon
Updated Branches:
refs/heads/master 736bbff30 -> 4ed6d855e
FALCON-716 PrismFeedSuspendTest tests retagged as distributed. 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/2094e6d7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/2094e6d7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/2094e6d7
Branch: refs/heads/master
Commit: 2094e6d761d8aa2de35f36844e888592d4217114
Parents: 736bbff
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Sun Sep 14 14:33:41 2014 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Sun Sep 14 14:33:41 2014 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../org/apache/falcon/regression/prism/PrismFeedSuspendTest.java | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2094e6d7/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index a3f428e..9dc2590 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -64,6 +64,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-716 PrismFeedSuspendTest tests retagged as distributed (Ruslan Ostafiychuk)
+
FALCON-713 UpdateAtSpecificTimeTest#updateTimeInPast_Feed should submitAndSchedule feed rather
then submit (Paul Isaychuk via Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/2094e6d7/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 1b4ad35..7de5e39 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
@@ -129,7 +129,7 @@ public class PrismFeedSuspendTest extends BaseTestClass {
*
* @throws Exception
*/
- @Test(groups = "embedded")
+ @Test(groups = "distributed")
public void testSuspendNonExistentFeedOnBothColos() throws Exception {
AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[0].getDataSets().get(0)));
AssertUtil.assertFailed(prism.getFeedHelper().suspend(bundles[1].getDataSets().get(0)));
@@ -143,7 +143,7 @@ public class PrismFeedSuspendTest extends BaseTestClass {
*
* @throws Exception
*/
- @Test(groups = "embedded")
+ @Test(groups = "distributed")
public void testSuspendSubmittedFeedOnBothColos() throws Exception {
bundles[0].submitFeed();
bundles[1].submitFeed();
[2/3] git commit: FALCON-715 "end" parameter should be greater than
last instances startTime. Contributed by Ruslan Ostafiychuk
Posted by ro...@apache.org.
FALCON-715 "end" parameter should be greater than last instances startTime. 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/a6173050
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/a6173050
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/a6173050
Branch: refs/heads/master
Commit: a617305086c962f900eb3e3c491ba2aaf6f425f2
Parents: 2094e6d
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Sun Sep 14 14:35:22 2014 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Sun Sep 14 14:35:22 2014 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../falcon/regression/ProcessInstanceKillsTest.java | 6 +++---
.../falcon/regression/ProcessInstanceSuspendTest.java | 10 +++++-----
3 files changed, 10 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a6173050/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 9dc2590..5fe65c2 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -64,6 +64,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-715 "end" parameter should be greater than last instances startTime (Ruslan Ostafiychuk)
+
FALCON-716 PrismFeedSuspendTest tests retagged as distributed (Ruslan Ostafiychuk)
FALCON-713 UpdateAtSpecificTimeTest#updateTimeInPast_Feed should submitAndSchedule feed rather
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a6173050/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 7b938ec..9b8eb30 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
@@ -222,10 +222,10 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
bundles[0].submitFeedsScheduleProcess(prism);
TimeUtil.sleepSeconds(TIMEOUT);
prism.getProcessHelper()
- .getProcessInstanceKill(processName, "?start=2010-01-02T01:05Z&end=2010-01-02T01:15Z");
+ .getProcessInstanceKill(processName, "?start=2010-01-02T01:05Z&end=2010-01-02T01:16Z");
TimeUtil.sleepSeconds(TIMEOUT);
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(r, 5, 2, 0, 0, 3);
}
@@ -244,7 +244,7 @@ public class ProcessInstanceKillsTest extends BaseTestClass {
prism.getProcessHelper().getProcessInstanceKill(processName, "?start=2010-01-02T01:20Z");
TimeUtil.sleepSeconds(TIMEOUT);
InstancesResult r = prism.getProcessHelper().getProcessInstanceStatus(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(r, 5, 4, 0, 0, 1);
}
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/a6173050/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 32759a0..b0739e6 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
@@ -157,12 +157,12 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.RUNNING);
InstancesResult result = prism.getProcessHelper().getProcessInstanceStatus(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(result, 5, 5, 0, 0, 0);
prism.getProcessHelper().getProcessInstanceSuspend(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
result = prism.getProcessHelper().getProcessInstanceStatus(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(result, 5, 0, 5, 0, 0);
}
@@ -263,11 +263,11 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.RUNNING);
InstancesResult result = prism.getProcessHelper().getProcessInstanceStatus(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(result, 5, 5, 0, 0, 0);
prism.getProcessHelper().getProcessInstanceSuspend(processName, "?start=2010-01-02T01:20Z");
result = prism.getProcessHelper().getProcessInstanceStatus(processName,
- "?start=2010-01-02T01:00Z&end=2010-01-02T01:20Z");
+ "?start=2010-01-02T01:00Z&end=2010-01-02T01:21Z");
InstanceUtil.validateResponse(result, 5, 4, 1, 0, 0);
}
[3/3] git commit: FALCON-723 Fix ProcessInstanceResumeTest and
ProcessInstanceSuspendTest as per FALCON-166. Contributed by Ruslan
Ostafiychuk
Posted by ro...@apache.org.
FALCON-723 Fix ProcessInstanceResumeTest and ProcessInstanceSuspendTest as per FALCON-166. 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/4ed6d855
Tree: http://git-wip-us.apache.org/repos/asf/incubator-falcon/tree/4ed6d855
Diff: http://git-wip-us.apache.org/repos/asf/incubator-falcon/diff/4ed6d855
Branch: refs/heads/master
Commit: 4ed6d855eac460068ff0246aaf1be93a8f0e081f
Parents: a617305
Author: Ruslan Ostafiychuk <ro...@apache.org>
Authored: Sun Sep 14 14:42:28 2014 +0300
Committer: Ruslan Ostafiychuk <ro...@apache.org>
Committed: Sun Sep 14 14:42:28 2014 +0300
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../org/apache/falcon/regression/ProcessInstanceResumeTest.java | 4 ++--
.../org/apache/falcon/regression/ProcessInstanceSuspendTest.java | 4 ++--
3 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4ed6d855/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index 5fe65c2..c88af6d 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -64,6 +64,8 @@ Trunk (Unreleased)
FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG)
BUG FIXES
+ FALCON-723 Fix ProcessInstanceResumeTest and ProcessInstanceSuspendTest as per FALCON-166 (Ruslan Ostafiychuk)
+
FALCON-715 "end" parameter should be greater than last instances startTime (Ruslan Ostafiychuk)
FALCON-716 PrismFeedSuspendTest tests retagged as distributed (Ruslan Ostafiychuk)
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4ed6d855/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 2e774c2..a4c9619 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
@@ -115,7 +115,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
wholeRange);
InstanceUtil.validateResponse(r, 6, 2, 4, 0, 0);
r = prism.getProcessHelper().getProcessInstanceResume(processName, "?end=2010-01-02T01:15Z");
- InstanceUtil.validateSuccessWithStatusCode(r, ResponseKeys.UNPARSEABLE_DATE);
+ InstanceUtil.validateSuccessWithStatusCode(r, 0);
}
/**
@@ -205,7 +205,7 @@ public class ProcessInstanceResumeTest extends BaseTestClass {
public void testProcessInstanceResumeNoParams() throws Exception {
bundles[0].submitFeedsScheduleProcess(prism);
InstancesResult r = prism.getProcessHelper().getProcessInstanceResume(processName, null);
- InstanceUtil.validateSuccessWithStatusCode(r, ResponseKeys.UNPARSEABLE_DATE);
+ InstanceUtil.validateSuccessWithStatusCode(r, 0);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-falcon/blob/4ed6d855/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 b0739e6..9497a49 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
@@ -121,7 +121,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
"?start=2010-01-02T00:00Z&end=2010-01-02T01:30Z");
result = prism.getProcessHelper().getProcessInstanceStatus(processName,
"?start=2010-01-02T00:00Z&end=2010-01-02T01:30Z");
- InstanceUtil.validateSuccessWithStatusCode(result, 400);
+ InstanceUtil.validateSuccessWithStatusCode(result, 0);
}
/**
@@ -180,7 +180,7 @@ public class ProcessInstanceSuspendTest extends BaseTestClass {
AssertUtil.checkStatus(clusterOC, EntityType.PROCESS, bundles[0].getProcessData(),
Job.Status.RUNNING);
InstancesResult r = prism.getProcessHelper().getProcessInstanceSuspend(processName, null);
- InstanceUtil.validateSuccessWithStatusCode(r, ResponseKeys.UNPARSEABLE_DATE);
+ InstanceUtil.validateSuccessWithStatusCode(r, 0);
}
/**