From ba6a013341f550b168bbd898b85f43bde7bc560d Mon Sep 17 00:00:00 2001 From: Junping Du Date: Tue, 10 Jan 2017 18:20:27 -0800 Subject: [PATCH] YARN-6079. Fix simple spelling errors in yarn test code. Contributed by vijay. (cherry picked from commit 4db119b7b55213929e5b86f2abb0ed84a21719b5) --- .../org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java | 2 +- .../hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java | 2 +- .../hadoop/yarn/server/nodemanager/TestNodeHealthService.java | 2 +- .../localizer/TestResourceLocalizationService.java | 2 +- .../apache/hadoop/yarn/server/resourcemanager/TestRMHA.java | 4 ++-- .../yarn/server/resourcemanager/TestRMNodeTransitions.java | 2 +- .../resourcemanager/scheduler/capacity/TestLeafQueue.java | 2 +- .../yarn/server/resourcemanager/webapp/TestRMWebApp.java | 2 +- .../resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java index 21a737dd557..82170b31342 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/api/BasePBImplRecordsTest.java @@ -222,7 +222,7 @@ private Map getGetSetPairs(Class recordClass) GetSetPair gsp = cur.getValue(); if ((gsp.getMethod == null) || (gsp.setMethod == null)) { - LOG.info(String.format("Exclude protential property: %s\n", gsp.propertyName)); + LOG.info(String.format("Exclude potential property: %s\n", gsp.propertyName)); itr.remove(); } else { LOG.info(String.format("New property: %s type: %s", gsp.toString(), gsp.type)); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java index 35bad4d6a31..54e331b71b9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-common/src/test/java/org/apache/hadoop/yarn/nodelabels/TestCommonNodeLabelsManager.java @@ -155,7 +155,7 @@ public void testAddInvalidlabel() throws IOException { } catch (IOException e) { caught = true; } - Assert.assertTrue("invalid label charactor should not add to repo", caught); + Assert.assertTrue("invalid label character should not add to repo", caught); caught = false; try { diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java index 2e41dea5304..4b013495f43 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestNodeHealthService.java @@ -163,7 +163,7 @@ public void testNodeHealthService() throws Exception { LOG.info("Checking Healthy--->timeout"); Assert.assertFalse("Node health status reported healthy even after timeout", healthStatus.getIsNodeHealthy()); - Assert.assertTrue("Node script time out message not propogated", + Assert.assertTrue("Node script time out message not propagated", healthStatus.getHealthReport().equals( NodeHealthScriptRunner.NODE_HEALTH_SCRIPT_TIMED_OUT_MSG + NodeHealthCheckerService.SEPARATOR 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/localizer/TestResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java index 7f3703f6304..38f461ba6c9 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/TestResourceLocalizationService.java @@ -2102,7 +2102,7 @@ rls.new LocalizerRunner(new LocalizerContext(user, container1 Assert.assertEquals(userCachePath, destinationDirectory.getParent() .toUri().toString()); } else { - throw new Exception("Unexpected resource recevied."); + throw new Exception("Unexpected resource received."); } } } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java index 3d08052d0f1..0efda9e6b02 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMHA.java @@ -622,7 +622,7 @@ protected Dispatcher createDispatcher() { HAServiceProtocol.RequestSource.REQUEST_BY_USER); FailFastDispatcher dispatcher = ((FailFastDispatcher) rm.rmContext.getDispatcher()); - // Verify transistion to transitionToStandby + // Verify transition to transitionToStandby rm.adminService.transitionToStandby(requestInfo); assertEquals("Fatal Event should be 0", 0, dispatcher.getEventCount()); assertEquals("HA state should be in standBy State", HAServiceState.STANDBY, @@ -630,7 +630,7 @@ protected Dispatcher createDispatcher() { try { // Verify refreshAll call failure and check fail Event is dispatched rm.adminService.transitionToActive(requestInfo); - Assert.fail("Transistion to Active should have failed for refreshAll()"); + Assert.fail("Transition to Active should have failed for refreshAll()"); } catch (Exception e) { assertTrue("Service fail Exception expected", e instanceof ServiceFailedException); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java index 6055afb81d4..ba806ab0902 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestRMNodeTransitions.java @@ -917,7 +917,7 @@ public void testResourceUpdateOnRebootedNode() { Assert.assertEquals(NodeState.REBOOTED, node.getState()); Assert.assertEquals("Active Nodes", initialActive, cm.getNumActiveNMs()); - Assert.assertEquals("Unhelathy Nodes", initialUnHealthy, + Assert.assertEquals("Unhealthy Nodes", initialUnHealthy, cm.getUnhealthyNMs()); Assert.assertEquals("Decommissioning Nodes", initialDecommissioning, cm.getNumDecommissioningNMs()); diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java index e59397345b3..1e70016060d 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestLeafQueue.java @@ -828,7 +828,7 @@ public void testDRFUserLimits() throws Exception { assertTrue("Verify user_1 got resources ", queueUser1.getUsed() .getMemorySize() > 0); assertTrue( - "Exepected AbsoluteUsedCapacity > 0.95, got: " + "Expected AbsoluteUsedCapacity > 0.95, got: " + b.getAbsoluteUsedCapacity(), b.getAbsoluteUsedCapacity() > 0.95); // Verify consumedRatio is based on dominant resources diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java index df8d67c3686..03fc2065bff 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebApp.java @@ -268,7 +268,7 @@ public static ClientRMService mockClientRMService(RMContext rmContext) { when(clientRMService.getApplications(any(GetApplicationsRequest.class))) .thenReturn(response); } catch (YarnException e) { - Assert.fail("Exception is not expteced."); + Assert.fail("Exception is not expected."); } return clientRMService; } diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java index 0f2b6eaab43..ff48c7a9aa3 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/webapp/TestRMWebServiceAppsNodelabel.java @@ -161,7 +161,7 @@ public void testAppsFinished() throws JSONException, Exception { assertEquals("incorrect number of elements", 1, apps.length()); try { apps.getJSONArray("app").getJSONObject(0).getJSONObject("resourceInfo"); - fail("resourceInfo object shouldnt be available for finished apps"); + fail("resourceInfo object shouldn't be available for finished apps"); } catch (Exception e) { assertTrue("resourceInfo shouldn't be available for finished apps", true); }