Return-Path: X-Original-To: apmail-tez-commits-archive@minotaur.apache.org Delivered-To: apmail-tez-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A3881741E for ; Wed, 29 Oct 2014 11:00:06 +0000 (UTC) Received: (qmail 4719 invoked by uid 500); 29 Oct 2014 11:00:06 -0000 Delivered-To: apmail-tez-commits-archive@tez.apache.org Received: (qmail 4684 invoked by uid 500); 29 Oct 2014 11:00:06 -0000 Mailing-List: contact commits-help@tez.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tez.apache.org Delivered-To: mailing list commits@tez.apache.org Received: (qmail 4674 invoked by uid 99); 29 Oct 2014 11:00:06 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Oct 2014 11:00:06 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 9A3CCA005CD; Wed, 29 Oct 2014 11:00:05 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zjffdu@apache.org To: commits@tez.apache.org Message-Id: <9b94efa30c0f4396b13383bcb2af5c8b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: git commit: TEZ-1689. addendum - fix unit test failure. (zjffdu) Date: Wed, 29 Oct 2014 11:00:05 +0000 (UTC) Repository: tez Updated Branches: refs/heads/master 9c166076e -> 1ffbc1935 TEZ-1689. addendum - fix unit test failure. (zjffdu) Project: http://git-wip-us.apache.org/repos/asf/tez/repo Commit: http://git-wip-us.apache.org/repos/asf/tez/commit/1ffbc193 Tree: http://git-wip-us.apache.org/repos/asf/tez/tree/1ffbc193 Diff: http://git-wip-us.apache.org/repos/asf/tez/diff/1ffbc193 Branch: refs/heads/master Commit: 1ffbc1935646f7c422b551e6e0ffdc001311d074 Parents: 9c16607 Author: Jeff Zhang Authored: Wed Oct 29 18:58:49 2014 +0800 Committer: Jeff Zhang Committed: Wed Oct 29 18:58:49 2014 +0800 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tez/blob/1ffbc193/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 6bf95ae..0d2ccb9 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -74,6 +74,7 @@ ALL CHANGES: TEZ-1689. Exception handling for EdgeManagerPlugin. TEZ-1701. ATS fixes to flush all history events and also using batching. TEZ-792. Default staging path should have user name. + TEZ-1689. addendum - fix unit test failure. Release 0.5.1: 2014-10-02 http://git-wip-us.apache.org/repos/asf/tez/blob/1ffbc193/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java ---------------------------------------------------------------------- diff --git a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java index a597d49..dc90a6f 100644 --- a/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java +++ b/tez-dag/src/test/java/org/apache/tez/dag/app/dag/impl/TestDAGImpl.java @@ -918,7 +918,7 @@ public class TestDAGImpl { dispatcher.getEventHandler().handle(new DAGEventStartDag(dagWithCustomEdge.getID(), null)); dispatcher.await(); - Assert.assertEquals(DAGState.FAILED, dagWithCustomEdge.getState()); + Assert.assertEquals(DAGState.RUNNING, dagWithCustomEdge.getState()); VertexImpl v1 = (VertexImpl)dagWithCustomEdge.getVertex("vertex1"); Task t1= v1.getTask(0);