You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tez.apache.org by je...@apache.org on 2014/11/17 20:22:36 UTC

[27/50] [abbrv] tez git commit: TEZ-1747. Increase test timeout for TestSecureShuffle (Rajesh Balamohan)

TEZ-1747. Increase test timeout for TestSecureShuffle (Rajesh Balamohan)


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

Branch: refs/heads/TEZ-8
Commit: 7c6085d24a2e8fa7a58b2fa32c47d283ca2b046f
Parents: 31c1de6
Author: Rajesh Balamohan <rb...@apache.org>
Authored: Thu Nov 6 18:21:24 2014 -0800
Committer: Rajesh Balamohan <rb...@apache.org>
Committed: Thu Nov 6 18:21:46 2014 -0800

----------------------------------------------------------------------
 CHANGES.txt                                                        | 1 +
 tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tez/blob/7c6085d2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 8fad485..e5a4eed 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -14,6 +14,7 @@ Release 0.5.3: Unreleased
 
 ALL CHANGES:
   TEZ-1745. TestATSHistoryLoggingService::testATSHistoryLoggingServiceShutdown can be flaky.
+  TEZ-1747. Increase test timeout for TestSecureShuffle.
 
 Release 0.5.2: Unreleased
 

http://git-wip-us.apache.org/repos/asf/tez/blob/7c6085d2/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
----------------------------------------------------------------------
diff --git a/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java b/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
index 8cce736..37a8ef6 100644
--- a/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
+++ b/tez-tests/src/test/java/org/apache/tez/test/TestSecureShuffle.java
@@ -149,7 +149,7 @@ public class TestSecureShuffle {
    *
    * @throws Exception
    */
-  @Test(timeout = 60000)
+  @Test(timeout = 240000)
   public void testSecureShuffle() throws Exception {
     //With tez-ssl setting
     miniTezCluster.getConfig().setBoolean(