You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@falcon.apache.org by aj...@apache.org on 2015/08/18 13:02:11 UTC

falcon git commit: FALCON-1392 FalconUnit tests fail. Contributed by Pavan Kumar Kolamuri.

Repository: falcon
Updated Branches:
  refs/heads/master 1591e49e2 -> fef9457fb


FALCON-1392 FalconUnit tests fail. Contributed by Pavan Kumar Kolamuri.


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

Branch: refs/heads/master
Commit: fef9457fbdaa3f9df8bc9f1977eb757d8354a7dc
Parents: 1591e49
Author: Ajay Yadava <aj...@gmail.com>
Authored: Tue Aug 18 15:51:51 2015 +0530
Committer: Ajay Yadava <aj...@gmail.com>
Committed: Tue Aug 18 15:51:51 2015 +0530

----------------------------------------------------------------------
 CHANGES.txt                                                       | 2 ++
 unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java | 2 +-
 unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java     | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/falcon/blob/fef9457f/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 23d7cf0..be33ca7 100755
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -89,6 +89,8 @@ Trunk (Unreleased)
     (Suhas Vasu)
 
   BUG FIXES
+    FALCON-1392 FalconUnit tests fail(Pavan Kumar Kolamuri via Ajay Yadava)
+  
     FALCON-1344 EntityGraph returns null in list of dependent entities(Ajay Yadava)
     
     FALCON-1330 When multiple cluster definitions exist for the same colo, triage produces unexpected results(Ajay Yadava)

http://git-wip-us.apache.org/repos/asf/falcon/blob/fef9457f/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
----------------------------------------------------------------------
diff --git a/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java b/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
index bd03efb..9f00d94 100644
--- a/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
+++ b/unit/src/test/java/org/apache/falcon/unit/FalconUnitTestBase.java
@@ -301,7 +301,7 @@ public class FalconUnitTestBase {
     }
 
     protected long waitForStatus(final EntityType entityType, final String entityName, final String instanceTime) {
-        return waitFor(20000, new Predicate() {
+        return waitFor(90000, new Predicate() {
             public boolean evaluate() throws Exception {
                 InstancesResult.WorkflowStatus status = falconUnitClient.getInstanceStatus(entityType,
                         entityName, instanceTime);

http://git-wip-us.apache.org/repos/asf/falcon/blob/fef9457f/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
----------------------------------------------------------------------
diff --git a/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java b/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
index 855be79..57b7b1b 100644
--- a/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
+++ b/unit/src/test/java/org/apache/falcon/unit/TestFalconUnit.java
@@ -49,7 +49,7 @@ public class TestFalconUnit extends FalconUnitTestBase {
         waitForStatus(EntityType.PROCESS, "process", scheduleTime);
         InstancesResult.WorkflowStatus status = falconUnitClient.getInstanceStatus(EntityType.PROCESS,
                 "process", scheduleTime);
-        Assert.assertEquals(InstancesResult.WorkflowStatus.SUCCEEDED, status);
+        Assert.assertEquals(status, InstancesResult.WorkflowStatus.SUCCEEDED);
         String outPath = getFeedPathForTS("local", "out", scheduleTime);
         Assert.assertTrue(getFileSystem().exists(new Path(outPath)));
         FileStatus[] files = getFileSystem().listStatus(new Path(outPath));