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 ha...@apache.org on 2015/03/24 07:28:36 UTC
hadoop git commit: YARN-1880. Cleanup
TestApplicationClientProtocolOnHA. Contributed by ozawa.
Repository: hadoop
Updated Branches:
refs/heads/branch-2 75d6d9e02 -> e7702ac6a
YARN-1880. Cleanup TestApplicationClientProtocolOnHA. Contributed by ozawa.
(cherry picked from commit 8a9bbf548dad82598354c24fcd4dc80a715da7ac)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/e7702ac6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/e7702ac6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/e7702ac6
Branch: refs/heads/branch-2
Commit: e7702ac6a15c9b0b04886db3f278e6847ca8c01b
Parents: 75d6d9e
Author: Harsh J <ha...@cloudera.com>
Authored: Tue Mar 24 11:57:28 2015 +0530
Committer: Harsh J <ha...@cloudera.com>
Committed: Tue Mar 24 11:58:16 2015 +0530
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../client/TestApplicationClientProtocolOnHA.java | 16 ++++++++++------
2 files changed, 13 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7702ac6/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index 107f5db..08fca56 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -10,6 +10,9 @@ Release 2.8.0 - UNRELEASED
IMPROVEMENTS
+ YARN-1880. Cleanup TestApplicationClientProtocolOnHA
+ (ozawa via harsh)
+
YARN-3243. CapacityScheduler should pass headroom from parent to children
to make sure ParentQueue obey its capacity limits. (Wangda Tan via jianhe)
http://git-wip-us.apache.org/repos/asf/hadoop/blob/e7702ac6/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java
index bfc6656..8e00554 100644
--- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java
+++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/TestApplicationClientProtocolOnHA.java
@@ -93,7 +93,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase {
public void testGetApplicationsOnHA() throws Exception {
List<ApplicationReport> reports =
client.getApplications();
- Assert.assertTrue(reports != null && !reports.isEmpty());
+ Assert.assertTrue(reports != null);
+ Assert.assertFalse(reports.isEmpty());
Assert.assertEquals(cluster.createFakeAppReports(),
reports);
}
@@ -101,7 +102,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase {
@Test(timeout = 15000)
public void testGetClusterNodesOnHA() throws Exception {
List<NodeReport> reports = client.getNodeReports(NodeState.RUNNING);
- Assert.assertTrue(reports != null && !reports.isEmpty());
+ Assert.assertTrue(reports != null);
+ Assert.assertFalse(reports.isEmpty());
Assert.assertEquals(cluster.createFakeNodeReports(),
reports);
}
@@ -117,8 +119,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase {
@Test(timeout = 15000)
public void testGetQueueUserAclsOnHA() throws Exception {
List<QueueUserACLInfo> queueUserAclsList = client.getQueueAclsInfo();
- Assert.assertTrue(queueUserAclsList != null
- && !queueUserAclsList.isEmpty());
+ Assert.assertTrue(queueUserAclsList != null);
+ Assert.assertFalse(queueUserAclsList.isEmpty());
Assert.assertEquals(cluster.createFakeQueueUserACLInfoList(),
queueUserAclsList);
}
@@ -136,7 +138,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase {
public void testGetApplicationAttemptsOnHA() throws Exception {
List<ApplicationAttemptReport> reports =
client.getApplicationAttempts(cluster.createFakeAppId());
- Assert.assertTrue(reports != null && !reports.isEmpty());
+ Assert.assertTrue(reports != null);
+ Assert.assertFalse(reports.isEmpty());
Assert.assertEquals(cluster.createFakeApplicationAttemptReports(),
reports);
}
@@ -153,7 +156,8 @@ public class TestApplicationClientProtocolOnHA extends ProtocolHATestBase {
public void testGetContainersOnHA() throws Exception {
List<ContainerReport> reports =
client.getContainers(cluster.createFakeApplicationAttemptId());
- Assert.assertTrue(reports != null && !reports.isEmpty());
+ Assert.assertTrue(reports != null);
+ Assert.assertFalse(reports.isEmpty());
Assert.assertEquals(cluster.createFakeContainerReports(),
reports);
}