You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by ss...@apache.org on 2015/12/12 00:49:15 UTC

tez git commit: TEZ-2920 org.apache.tez.client.TestTezClient.testStopRetriesUntilTimeout is flaky. (sseth)

Repository: tez
Updated Branches:
  refs/heads/master b748ffe1e -> 765f41fca


TEZ-2920 org.apache.tez.client.TestTezClient.testStopRetriesUntilTimeout is flaky. (sseth)


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

Branch: refs/heads/master
Commit: 765f41fcab87d92bc731f081b83fd8f8d511d1c4
Parents: b748ffe
Author: Siddharth Seth <ss...@apache.org>
Authored: Fri Dec 11 14:58:58 2015 -0800
Committer: Siddharth Seth <ss...@apache.org>
Committed: Fri Dec 11 14:58:58 2015 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                    | 1 +
 tez-api/src/test/java/org/apache/tez/client/TestTezClient.java | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/765f41fc/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index f4cf73e..67b40db 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -10,6 +10,7 @@ INCOMPATIBLE CHANGES
   TEZ-604. Revert temporary changes made in TEZ-603 to kill the provided tez session, if running a MapReduce job.
 
 ALL CHANGES:
+  TEZ-2920. org.apache.tez.client.TestTezClient.testStopRetriesUntilTimeout is flaky.
   TEZ-2824. Add javadocs for Vertex.setConf and DAG.setConf.
   TEZ-2911. Null location Strings can cause problems with GroupedSplit serialization.
   TEZ-2990. Change test-patch.sh to run through all tests, despite failures in upstream modules

http://git-wip-us.apache.org/repos/asf/tez/blob/765f41fc/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
----------------------------------------------------------------------
diff --git a/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java b/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
index 92cee1d..9adb9bd 100644
--- a/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
+++ b/tez-api/src/test/java/org/apache/tez/client/TestTezClient.java
@@ -543,7 +543,7 @@ public class TestTezClient {
     verify(client.mockYarnClient, atLeast(2)).getApplicationReport(client.mockAppId);
   }
 
-  @Test(timeout = 5000)
+  @Test(timeout = 20000)
   public void testStopRetriesUntilTimeout() throws Exception {
     TezConfiguration conf = new TezConfiguration();
     conf.setBoolean(TezConfiguration.TEZ_CLIENT_ASYNCHRONOUS_STOP, false);
@@ -551,7 +551,7 @@ public class TestTezClient {
     final TezClientForTest client = configureAndCreateTezClient(conf);
     client.start();
     when(client.mockYarnClient.getApplicationReport(client.mockAppId).getYarnApplicationState())
-        .thenReturn(YarnApplicationState.NEW);
+        .thenReturn(YarnApplicationState.RUNNING);
     long start = System.currentTimeMillis();
     try {
       client.stop();