Repository: falcon Updated Branches: refs/heads/master 8d130d88c -> c1b44232f
FALCON-1177 Changing method modifier to make it be not concerned as a test. Contributed by Paul Isaychuk Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/c1b44232 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/c1b44232 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/c1b44232 Branch: refs/heads/master Commit: c1b44232f8c18356ea8349b185a524d4a3f36d90 Parents: 8d130d8 Author: Ruslan Ostafiychuk <[email protected]> Authored: Wed Apr 29 15:50:54 2015 +0300 Committer: Ruslan Ostafiychuk <[email protected]> Committed: Wed Apr 29 16:03:54 2015 +0300 ---------------------------------------------------------------------- falcon-regression/CHANGES.txt | 3 +++ .../falcon/regression/hcat/HCatFeedOperationsTest.java | 8 ++------ 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/c1b44232/falcon-regression/CHANGES.txt ---------------------------------------------------------------------- diff --git a/falcon-regression/CHANGES.txt b/falcon-regression/CHANGES.txt index 193beff..951af84 100644 --- a/falcon-regression/CHANGES.txt +++ b/falcon-regression/CHANGES.txt @@ -305,6 +305,9 @@ Trunk (Unreleased) FALCON-681 delete duplicate feed retention test from falcon regression (SamarthG) BUG FIXES + FALCON-1177 Changing method modifier to make it be not concerned as a test (Paul Isaychuk via + Ruslan Ostafiychuk) + FALCON-1166 Fixing FeedReplicationTest, TouchAPIPrismAndServerTest, ProcessLibPathLoadTest (Pragya Mittal via Ruslan Ostafiychuk) http://git-wip-us.apache.org/repos/asf/falcon/blob/c1b44232/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java ---------------------------------------------------------------------- diff --git a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java index 67cbc52..4d2ac2d 100644 --- a/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java +++ b/falcon-regression/merlin/src/test/java/org/apache/falcon/regression/hcat/HCatFeedOperationsTest.java @@ -72,12 +72,9 @@ public class HCatFeedOperationsTest extends BaseTestClass { private String feed; private String aggregateWorkflowDir = cleanAndGetTestDir() + "/aggregator"; - public void uploadWorkflow() throws Exception { - uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE); - } - @BeforeClass(alwaysRun = true) public void createTestData() throws Exception { + uploadDirToClusters(aggregateWorkflowDir, OSUtil.RESOURCES_OOZIE); clusterHC = cluster.getClusterHelper().getHCatClient(); cluster2HC = cluster2.getClusterHelper().getHCatClient(); //create an empty table for feed operations @@ -99,7 +96,6 @@ public class HCatFeedOperationsTest extends BaseTestClass { bundles[0].generateUniqueBundle(this); bundles[0].setClusterInterface(Interfacetype.REGISTRY, cluster.getClusterHelper().getHCatEndpoint()); - bundles[1] = new Bundle(bundle, cluster2.getPrefix()); bundles[1].generateUniqueBundle(this); bundles[1].setClusterInterface(Interfacetype.REGISTRY, cluster2.getClusterHelper().getHCatEndpoint()); @@ -256,7 +252,7 @@ public class HCatFeedOperationsTest extends BaseTestClass { } - public static void createEmptyTable(HCatClient cli, String dbName, String tabName, + private static void createEmptyTable(HCatClient cli, String dbName, String tabName, List<HCatFieldSchema> partitionCols) throws HCatException{ ArrayList<HCatFieldSchema> cols = new ArrayList<HCatFieldSchema>();
