You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2016/08/15 19:22:18 UTC

hadoop git commit: YARN-4916. TestNMProxy.tesNMProxyRPCRetry fails. Contributed by Tibor Kiss. (cherry picked from commit 00058167431475c6e63c80207424f1d365569e3a)

Repository: hadoop
Updated Branches:
  refs/heads/branch-2.8 579709fc2 -> 1a38dd9ce


YARN-4916. TestNMProxy.tesNMProxyRPCRetry fails. Contributed by Tibor Kiss.
(cherry picked from commit 00058167431475c6e63c80207424f1d365569e3a)


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

Branch: refs/heads/branch-2.8
Commit: 1a38dd9ceefd972869c4550a502cb169544cd423
Parents: 579709f
Author: Junping Du <ju...@apache.org>
Authored: Tue Apr 5 09:01:08 2016 -0700
Committer: Jason Lowe <jl...@apache.org>
Committed: Mon Aug 15 19:18:36 2016 +0000

----------------------------------------------------------------------
 .../yarn/server/nodemanager/containermanager/TestNMProxy.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/1a38dd9c/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
index 7ce15c5..46b32de 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/TestNMProxy.java
@@ -188,8 +188,7 @@ public class TestNMProxy extends BaseContainerManagerTest {
       Assert.fail("should get socket exception");
     } catch (IOException e) {
       // socket exception should be thrown immediately, without RPC retries.
-      Assert.assertTrue(e.toString().
-          contains("Failed on local exception: java.net.SocketException"));
+      Assert.assertTrue(e instanceof java.net.SocketException);
     }
   }
 


---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org