Repository: falcon Updated Branches: refs/heads/master 879204671 -> 8cc681075
FALCON-1469 Flaky EntityManagerJerseyIT#testDuplicateSubmitCommands. Contributed by Sandeep Samudrala. Project: http://git-wip-us.apache.org/repos/asf/falcon/repo Commit: http://git-wip-us.apache.org/repos/asf/falcon/commit/8cc68107 Tree: http://git-wip-us.apache.org/repos/asf/falcon/tree/8cc68107 Diff: http://git-wip-us.apache.org/repos/asf/falcon/diff/8cc68107 Branch: refs/heads/master Commit: 8cc6810756794f0d738232b9bfc33b4fa6e5cc66 Parents: 8792046 Author: Ajay Yadava <[email protected]> Authored: Tue Sep 29 20:27:17 2015 +0530 Committer: Ajay Yadava <[email protected]> Committed: Tue Sep 29 20:27:17 2015 +0530 ---------------------------------------------------------------------- CHANGES.txt | 2 ++ .../java/org/apache/falcon/resource/EntityManagerJerseyIT.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/falcon/blob/8cc68107/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 0c03cf2..d848515 100755 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -45,6 +45,8 @@ Trunk (Unreleased) FALCON-1403 Revisit IT cleanup and teardown(Narayan Periwal via Pallavi Rao) BUG FIXES + FALCON-1469 Flaky EntityManagerJerseyIT#testDuplicateSubmitCommands(Sandeep Samudrala via Ajay Yadava) + FALCON-1470 HiveDRStatusStoreTest should fail when using fakeGroup to create StatusStore(Balu Vellanki via Sowmya Ramesh) FALCON-1462 Modify use of "testuser" in UTs and ITs(Narayan Periwal via Sowmya Ramesh) http://git-wip-us.apache.org/repos/asf/falcon/blob/8cc68107/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java ---------------------------------------------------------------------- diff --git a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java index 384c8a0..23c59f4 100644 --- a/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java +++ b/webapp/src/test/java/org/apache/falcon/resource/EntityManagerJerseyIT.java @@ -587,6 +587,8 @@ public class EntityManagerJerseyIT { TestContext context = newContext(); Map<String, String> overlay = context.getUniqueOverlay(); + context.submitToFalcon(TestContext.CLUSTER_TEMPLATE, overlay, EntityType.CLUSTER); + ExecutorService service = Executors.newSingleThreadExecutor(); ExecutorService duplicateService = Executors.newSingleThreadExecutor(); @@ -1020,7 +1022,7 @@ public class EntityManagerJerseyIT { @Override public ClientResponse call() throws Exception { - return context.submitToFalcon(TestContext.CLUSTER_TEMPLATE, overlay, EntityType.CLUSTER); + return context.submitToFalcon(TestContext.FEED_TEMPLATE1, overlay, EntityType.FEED); } }
