You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by pr...@apache.org on 2016/03/01 07:44:26 UTC
falcon git commit: FALCON-1841 Grouping test in falcon for running
nightly regression(Pragya Mittal)
Repository: falcon
Updated Branches:
refs/heads/master b6250688f -> 1d3751958
FALCON-1841 Grouping test in falcon for running nightly regression(Pragya Mittal)
Author: Pragya <mi...@gmail.com>
Reviewers: Murali Ramasami <mu...@gmail.com>
Closes #51 from pragya-mittal/grouping
Project: http://git-wip-us.apache.org/repos/asf/falcon/repo
Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/1d375195
Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/1d375195
Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/1d375195
Branch: refs/heads/master
Commit: 1d37519582b4d98c6f879da33444fbcf3cd584f2
Parents: b625068
Author: Pragya <mi...@gmail.com>
Authored: Tue Mar 1 12:13:55 2016 +0530
Committer: Pragya Mittal <mi...@gmail.com>
Committed: Tue Mar 1 12:13:55 2016 +0530
----------------------------------------------------------------------
falcon-regression/CHANGES.txt | 2 ++
.../org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java | 2 +-
.../org/apache/falcon/regression/ELExpFutureAndLatestTest.java | 2 +-
.../test/java/org/apache/falcon/regression/ELValidationsTest.java | 2 +-
.../java/org/apache/falcon/regression/EmbeddedPigScriptTest.java | 2 +-
.../java/org/apache/falcon/regression/FeedInstanceListingTest.java | 2 +-
.../java/org/apache/falcon/regression/FeedInstanceStatusTest.java | 2 +-
.../test/java/org/apache/falcon/regression/FeedLateRerunTest.java | 2 +-
.../java/org/apache/falcon/regression/FeedReplicationTest.java | 2 +-
.../src/test/java/org/apache/falcon/regression/FeedResumeTest.java | 2 +-
.../src/test/java/org/apache/falcon/regression/FeedSLATest.java | 2 +-
.../test/java/org/apache/falcon/regression/FeedScheduleTest.java | 2 +-
.../src/test/java/org/apache/falcon/regression/FeedStatusTest.java | 2 +-
.../org/apache/falcon/regression/FeedSubmitAndScheduleTest.java | 2 +-
.../src/test/java/org/apache/falcon/regression/FeedSubmitTest.java | 2 +-
.../test/java/org/apache/falcon/regression/FeedSuspendTest.java | 2 +-
.../test/java/org/apache/falcon/regression/InstanceParamTest.java | 2 +-
.../java/org/apache/falcon/regression/InstanceSummaryTest.java | 2 +-
.../src/test/java/org/apache/falcon/regression/LogMoverTest.java | 2 +-
.../java/org/apache/falcon/regression/ProcessFrequencyTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceColoMixedTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceKillsTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceRerunTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceResumeTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceRunningTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceStatusTest.java | 2 +-
.../org/apache/falcon/regression/ProcessInstanceSuspendTest.java | 2 +-
.../java/org/apache/falcon/regression/ProcessLateRerunTest.java | 2 +-
.../java/org/apache/falcon/regression/ProcessLibPathLoadTest.java | 2 +-
.../test/java/org/apache/falcon/regression/ProcessLibPathTest.java | 2 +-
.../src/test/java/org/apache/falcon/regression/ProcessSLATest.java | 2 +-
.../test/java/org/apache/falcon/regression/ProcessUpdateTest.java | 2 +-
.../org/apache/falcon/regression/TouchAPIPrismAndServerTest.java | 2 +-
.../apache/falcon/regression/ValidateAPIPrismAndServerTest.java | 2 +-
.../apache/falcon/regression/entity/EntitiesPatternSearchTest.java | 2 +-
.../java/org/apache/falcon/regression/entity/ListEntitiesTest.java | 2 +-
.../org/apache/falcon/regression/lineage/EntityLineageTest.java | 2 +-
.../apache/falcon/regression/lineage/ListFeedInstancesTest.java | 2 +-
.../apache/falcon/regression/lineage/ListProcessInstancesTest.java | 2 +-
.../org/apache/falcon/regression/lineage/ProcessPipelineTest.java | 2 +-
.../java/org/apache/falcon/regression/prism/EntityDryRunTest.java | 2 +-
.../java/org/apache/falcon/regression/prism/OptionalInputTest.java | 2 +-
.../apache/falcon/regression/prism/PrismConcurrentRequestTest.java | 2 +-
.../falcon/regression/prism/PrismFeedReplicationUpdateTest.java | 2 +-
.../org/apache/falcon/regression/prism/PrismFeedScheduleTest.java | 2 +-
.../java/org/apache/falcon/regression/prism/PrismFeedSnSTest.java | 1 +
.../org/apache/falcon/regression/prism/PrismFeedSuspendTest.java | 1 +
.../org/apache/falcon/regression/prism/PrismFeedUpdateTest.java | 2 +-
.../apache/falcon/regression/prism/PrismProcessScheduleTest.java | 1 +
.../apache/falcon/regression/prism/PrismProcessSuspendTest.java | 1 +
.../falcon/regression/prism/ProcessPartitionExpVariableTest.java | 2 +-
.../falcon/regression/prism/RescheduleKilledProcessTest.java | 2 +-
.../regression/prism/RescheduleProcessInFinalStatesTest.java | 2 +-
.../java/org/apache/falcon/regression/prism/RetentionTest.java | 2 +-
.../apache/falcon/regression/prism/UpdateAtSpecificTimeTest.java | 1 +
.../falcon/regression/triage/FeedInstanceDependencyTest.java | 2 +-
.../falcon/regression/triage/PipelineInstanceDependencyTest.java | 2 +-
.../falcon/regression/triage/ProcessInstanceDependencyTest.java | 2 +-
.../apache/falcon/regression/triage/TriageAPISingleColoTest.java | 2 +-
59 files changed, 60 insertions(+), 53 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/CHANGES.txt
----------------------------------------------------------------------
diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt
index e3f7264..0fff007 100644
--- a/falcon-regression/CHANGES.txt
+++ b/falcon-regression/CHANGES.txt
@@ -127,6 +127,8 @@ Trunk (Unreleased)
via Samarth Gupta)
IMPROVEMENTS
+ FALCON-1841 Grouping test in falcon for running nightly regression(Pragya Mittal)
+
FALCON-1819 Improve test class entity cleanup logic (Paul Isaychuk)
FALCON-1697 Stabilization of scenarios which are based on instances lifecycle(Paul Isaychuk via Ajay Yadava)
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java
index 3eb7bed..9d04ca3 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpCurrentAndLastWeekTest.java
@@ -49,7 +49,7 @@ import java.util.List;
* EL Expression Current and last week test.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ELExpCurrentAndLastWeekTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
index 90826f1..49dfcc0 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ELExpFutureAndLatestTest.java
@@ -43,7 +43,7 @@ import java.util.List;
/**
* EL Expression test.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ELExpFutureAndLatestTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 a0922cb..86936c8 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
@@ -53,7 +53,7 @@ import java.util.TimeZone;
/**
* EL Validations tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ELValidationsTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 c49c381..564100e 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
@@ -52,7 +52,7 @@ import java.util.List;
/**
* Embedded pig script test.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class EmbeddedPigScriptTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
index ecb5798..88cb472 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedInstanceListingTest.java
@@ -50,7 +50,7 @@ import java.util.List;
/**
* Test for https://issues.apache.org/jira/browse/FALCON-761.
*/
-@Test(groups = "embedded", timeOut = 900000)
+@Test(groups = { "distributed", "embedded" }, timeOut = 900000)
public class FeedInstanceListingTest extends BaseTestClass{
private String baseTestDir = cleanAndGetTestDir();
private String aggregateWorkflowDir = baseTestDir + "/aggregator";
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 514fd10..8b9ae70 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
@@ -43,7 +43,7 @@ import org.testng.annotations.Test;
/**
* Feed instance status tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedInstanceStatusTest extends BaseTestClass {
private String baseTestDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
index 5bb5e6e..ec2b877 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedLateRerunTest.java
@@ -56,7 +56,7 @@ import java.util.List;
* On adding further late data it checks whether the data has been replicated correctly in the given late cut-off time.
* Assuming that late frequency set in server is 3 minutes. Although value can be changed according to requirement.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedLateRerunTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 a936aa1..dad0dc2 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
@@ -60,7 +60,7 @@ import java.util.Map;
* feed replication test.
* Replicates empty directories as well as directories containing data.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedReplicationTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 ec117d7..2e64569 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
@@ -38,7 +38,7 @@ import org.testng.annotations.Test;
/**
* Feed resume tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedResumeTest extends BaseTestClass {
private final AbstractEntityHelper feedHelper = prism.getFeedHelper();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java
index 28ddbd7..088e98f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/FeedSLATest.java
@@ -39,7 +39,7 @@ import org.testng.annotations.Test;
/**
* Feed SLA tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedSLATest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 79b722a..5a9d473 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
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
/**
* Feed schedule tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedScheduleTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 d5e8696..9abe1f2 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
@@ -39,7 +39,7 @@ import org.testng.annotations.Test;
/**
* Feed status tests. Checks getStatus functionality.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedStatusTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 f7bf0f8..e5ed322 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
@@ -43,7 +43,7 @@ import java.net.URISyntaxException;
/**
* Feed submit and schedule tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedSubmitAndScheduleTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 53f3df8..cf992f5 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
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
/**
* Feed submission tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedSubmitTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 5217818..953be09 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
@@ -35,7 +35,7 @@ import org.testng.annotations.Test;
/**
* Feed suspend tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class FeedSuspendTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 33808bf..779243b 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
@@ -49,7 +49,7 @@ import java.net.URISyntaxException;
/**
* tests for instance option params.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class InstanceParamTest extends BaseTestClass {
/**
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 137491d..df1716f 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
@@ -54,7 +54,7 @@ import java.util.List;
3. feed : same as test 1 for feed
4. feed : same as test 2 for feed
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class InstanceSummaryTest extends BaseTestClass {
private String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/LogMoverTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/LogMoverTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/LogMoverTest.java
index f936305..cb194f8 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/LogMoverTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/LogMoverTest.java
@@ -49,7 +49,7 @@ import java.util.List;
* It is not working for map-reduce actions(FALCON-1038).
* Using pig-action to test this feature.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class LogMoverTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
index b0480e9..77bd62f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessFrequencyTest.java
@@ -46,7 +46,7 @@ import org.testng.annotations.Test;
/**
* Test process with different frequency combinations.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessFrequencyTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(ProcessFrequencyTest.class);
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 91d39a7..20f8f46 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
@@ -48,7 +48,7 @@ import java.util.List;
/**
* Process instance mixed colo tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ProcessInstanceColoMixedTest extends BaseTestClass {
private final String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 48c8021..71b3969 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
@@ -49,7 +49,7 @@ import java.util.List;
/**
* Process instance kill tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessInstanceKillsTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 d5b4ef2..ca0e849 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
@@ -50,7 +50,7 @@ import java.util.List;
/**
* Test Suite for instance rerun.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessInstanceRerunTest extends BaseTestClass {
private boolean restartRequired;
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 b7f4428..ebc06d6 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
@@ -43,7 +43,7 @@ import org.testng.annotations.Test;
/**
* Process instance resume tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessInstanceResumeTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 98fdcca..97250b3 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
@@ -47,7 +47,7 @@ import org.testng.annotations.Test;
/**
* Regression for instance running api.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessInstanceRunningTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 14ecfe4..e20df64 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
@@ -56,7 +56,7 @@ import java.util.List;
/**
* Process instance status tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessInstanceStatusTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 4a27a0a..edbaf1f 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
@@ -44,7 +44,7 @@ import java.io.IOException;
/**
* Process instance suspend tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessInstanceSuspendTest extends BaseTestClass {
private String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
index 6a12fc8..0660c74f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLateRerunTest.java
@@ -52,7 +52,7 @@ import java.util.List;
/**
* Process late data test.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ProcessLateRerunTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
private OozieClient cluster1OC = serverOC.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java
index 8422796..11fe138 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessLibPathLoadTest.java
@@ -55,7 +55,7 @@ import java.util.Map;
/**
* Tests with process lib folder with workflow.xml.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ProcessLibPathLoadTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 4196d99..6e19586 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
@@ -44,7 +44,7 @@ import java.util.List;
/**
* Tests with process lib folder detached from workflow.xml.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessLibPathTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java
index f4c9b30..514fd68 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessSLATest.java
@@ -39,7 +39,7 @@ import org.testng.annotations.Test;
/**
* Process SLA tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessSLATest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessUpdateTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessUpdateTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessUpdateTest.java
index dbb45a6..40061b5 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessUpdateTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ProcessUpdateTest.java
@@ -43,7 +43,7 @@ import org.testng.annotations.Test;
/**
* Tests related to update feature.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessUpdateTest extends BaseTestClass {
private OozieClient clusterOC = serverOC.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java
index 25cf16f..297ef5d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/TouchAPIPrismAndServerTest.java
@@ -45,7 +45,7 @@ import javax.xml.bind.JAXBException;
/**
* Touch feature test both via server and prism.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class TouchAPIPrismAndServerTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ValidateAPIPrismAndServerTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ValidateAPIPrismAndServerTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ValidateAPIPrismAndServerTest.java
index ca612b8..1368519 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ValidateAPIPrismAndServerTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/ValidateAPIPrismAndServerTest.java
@@ -37,7 +37,7 @@ import org.testng.annotations.Test;
/**
* Validate API is exposed both via server and prism.
*/
-@Test(groups = {"singleCluster"})
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ValidateAPIPrismAndServerTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
index 461b733..8f6b0e4 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/EntitiesPatternSearchTest.java
@@ -49,7 +49,7 @@ import java.util.regex.Pattern;
/**
* Testing the pattern search of entities. Falcon-914
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class EntitiesPatternSearchTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(EntitiesPatternSearchTest.class);
private String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
index 011d02d..e06ff90 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/entity/ListEntitiesTest.java
@@ -51,7 +51,7 @@ import java.util.Random;
/**
* Testing the list entities API.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ListEntitiesTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(ListEntitiesTest.class);
private String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntityLineageTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntityLineageTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntityLineageTest.java
index 52cb198..29fc871 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntityLineageTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/EntityLineageTest.java
@@ -50,7 +50,7 @@ import java.util.List;
/**
* Test Suite for Entity lineage.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class EntityLineageTest extends BaseTestClass {
private String baseTestDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
index b3ca4f0..4f86594 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListFeedInstancesTest.java
@@ -59,7 +59,7 @@ import java.util.List;
* expected instance statuses which are being compared with actual result of -list request
* with different parameters in different order, variation, etc.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ListFeedInstancesTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(ListFeedInstancesTest.class);
private OozieClient cluster2OC = serverOC.get(1);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
index a4022a8..45cc9be 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ListProcessInstancesTest.java
@@ -47,7 +47,7 @@ import java.util.UUID;
/**
* Test list instances api for process.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ListProcessInstancesTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(ListProcessInstancesTest.class);
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
index bd4b9c2..a0b6e4f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/lineage/ProcessPipelineTest.java
@@ -48,7 +48,7 @@ import java.util.List;
/**
* Submitting and listing processes with different pipeline names.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class ProcessPipelineTest extends BaseTestClass{
private static final Logger LOGGER = Logger.getLogger(ProcessPipelineTest.class);
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 4dc776f..36cf704 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
@@ -44,7 +44,7 @@ import javax.xml.bind.JAXBException;
/**
* test cases for https://issues.apache.org/jira/browse/FALCON-353.
*/
-@Test(groups = "embedded")
+@Test(groups = { "prism", "distributed", "embedded" })
public class EntityDryRunTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 944c67f..61855de 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
@@ -44,7 +44,7 @@ import java.util.List;
/**
* Tests with optional input.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class OptionalInputTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 515e97e..9a96b6a 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
@@ -42,7 +42,7 @@ import org.testng.annotations.Test;
/**
* Tests with concurrent request to prism.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class PrismConcurrentRequestTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 c7d9d2d..405725d 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
@@ -49,7 +49,7 @@ import java.io.IOException;
/**
* Update replication feed tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class PrismFeedReplicationUpdateTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
index a7bef6d..137ef6f 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismFeedScheduleTest.java
@@ -38,7 +38,7 @@ import java.io.IOException;
/**
* Schedule feed via prism tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class PrismFeedScheduleTest extends BaseTestClass {
private OozieClient cluster1OC = serverOC.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 dee8e33..98d6f4e 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
@@ -44,6 +44,7 @@ import org.testng.annotations.Test;
/**
* Submit and schedule feed via prism tests.
*/
+@Test(groups = "distributed")
public class PrismFeedSnSTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 c02a28f..086a014 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
@@ -38,6 +38,7 @@ import org.testng.annotations.Test;
/**
* Suspend feed via prism tests.
*/
+@Test(groups = "distributed")
public class PrismFeedSuspendTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 ed48265..a5220e3 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
@@ -53,7 +53,7 @@ import java.util.Random;
/**
* Update feed via prism tests.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class PrismFeedUpdateTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
index 2dd602a..e571730 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessScheduleTest.java
@@ -45,6 +45,7 @@ import java.util.ArrayList;
/**
* Schedule process via prism tests.
*/
+@Test(groups = "distributed")
public class PrismProcessScheduleTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
index e38cc67..752d18c 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/PrismProcessSuspendTest.java
@@ -38,6 +38,7 @@ import org.testng.annotations.Test;
/**
* Suspend process tests.
*/
+@Test(groups = "distributed")
public class PrismProcessSuspendTest extends BaseTestClass {
private ColoHelper cluster1 = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 30b20c5..0b3f16d 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
@@ -46,7 +46,7 @@ import java.util.List;
/**
* Tests with partitions as expression language variables.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ProcessPartitionExpVariableTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(ProcessPartitionExpVariableTest.class);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 c4fa214..df5269b 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
@@ -40,7 +40,7 @@ import java.util.Random;
/**
* Tests with rescheduling killed process.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class RescheduleKilledProcessTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 5031de4..a2b5d8d 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
@@ -52,7 +52,7 @@ import java.util.List;
/**
* Tests with rescheduling process in final states.
*/
-@Test(groups = "embedded", enabled = true)
+@Test(groups = { "distributed", "embedded" })
public class RescheduleProcessInFinalStatesTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
index b677433..0ea9514 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/prism/RetentionTest.java
@@ -72,7 +72,7 @@ import java.util.Random;
/**
* Test with retention.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class RetentionTest extends BaseTestClass {
private static final String TEST_FOLDERS = "/testFolders/";
private String baseTestHDFSDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/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 c6861ca..f2eae62 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
@@ -61,6 +61,7 @@ import java.util.List;
/**
* Test updating of feed with custom update time.
*/
+@Test(groups = "distributed")
public class UpdateAtSpecificTimeTest extends BaseTestClass {
private static final Logger LOGGER = Logger.getLogger(UpdateAtSpecificTimeTest.class);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/FeedInstanceDependencyTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/FeedInstanceDependencyTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/FeedInstanceDependencyTest.java
index fe9f565..e7ddcd1 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/FeedInstanceDependencyTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/FeedInstanceDependencyTest.java
@@ -44,7 +44,7 @@ import java.util.List;
/**
* Test Suite for feed InstanceDependency corresponding to FALCON-1039.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class FeedInstanceDependencyTest extends BaseTestClass {
private String baseTestDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/PipelineInstanceDependencyTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/PipelineInstanceDependencyTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/PipelineInstanceDependencyTest.java
index 81d5fcc..a494048 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/PipelineInstanceDependencyTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/PipelineInstanceDependencyTest.java
@@ -66,7 +66,7 @@ import java.util.Map;
/**
* Test for instance dependency endpoint.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded", "sanity" })
public class PipelineInstanceDependencyTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/ProcessInstanceDependencyTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/ProcessInstanceDependencyTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/ProcessInstanceDependencyTest.java
index e93cd36..b89060d 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/ProcessInstanceDependencyTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/ProcessInstanceDependencyTest.java
@@ -44,7 +44,7 @@ import org.testng.annotations.Test;
/**
* Test Suite for process InstanceDependency corresponding to FALCON-1039.
*/
-@Test(groups = "embedded")
+@Test(groups = { "distributed", "embedded" })
public class ProcessInstanceDependencyTest extends BaseTestClass {
private String baseTestDir = cleanAndGetTestDir();
http://git-wip-us.apache.org/repos/asf/falcon/blob/1d375195/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/TriageAPISingleColoTest.java
----------------------------------------------------------------------
diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/TriageAPISingleColoTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/TriageAPISingleColoTest.java
index 70d1e17..514b1c1 100644
--- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/TriageAPISingleColoTest.java
+++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/triage/TriageAPISingleColoTest.java
@@ -51,7 +51,7 @@ import java.util.List;
/**
* Test Class for Testing the Triage API on a single colo corresponding to FALCON-1377.
*/
-@Test(groups = {"singleCluster"})
+@Test(groups = { "distributed", "embedded", "sanity" })
public class TriageAPISingleColoTest extends BaseTestClass {
private ColoHelper cluster = servers.get(0);
private OozieClient clusterOC = serverOC.get(0);