SLIDER-832 purge two tests that are invalid now that the skip-unreliable-nodes logic has moved from OutstandingRequest up to RoleHistory
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/14b90b3d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/14b90b3d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/14b90b3d Branch: refs/heads/develop Commit: 14b90b3daaa01a352319b3e73df1f648843aa0b7 Parents: fc7f736 Author: Steve Loughran <ste...@apache.org> Authored: Thu Mar 26 15:12:41 2015 +0000 Committer: Steve Loughran <ste...@apache.org> Committed: Thu Mar 26 15:12:41 2015 +0000 ---------------------------------------------------------------------- ...tRoleHistoryOutstandingRequestTracker.groovy | 31 -------------------- 1 file changed, 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/14b90b3d/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy index 3d396f8..99e4190 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/history/TestRoleHistoryOutstandingRequestTracker.groovy @@ -19,7 +19,6 @@ package org.apache.slider.server.appmaster.model.history import org.apache.hadoop.yarn.api.records.Resource -import org.apache.hadoop.yarn.client.api.AMRMClient import org.apache.slider.providers.PlacementPolicy import org.apache.slider.providers.ProviderRole import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest @@ -208,36 +207,6 @@ class TestRoleHistoryOutstandingRequestTracker extends BaseMockAppStateTest { } - @Test - public void testPlacementSkipsFailures() throws Throwable { - final def (res0, outstanding0) = newRequest(role0Status) - def entry = host1.getOrCreate(role0Status.key) - entry.containerCompleted(false) - entry.containerCompleted(false) - entry.containerCompleted(false) - assert entry.failedRecently == 3 - final AMRMClient.ContainerRequest initialRequest = - outstanding0.buildContainerRequest(res0, role0Status, 0, null) - assert initialRequest.relaxLocality - assert initialRequest.nodes == null - } - - @Test - public void testStrictPlacementDoesntSkipFailures() throws Throwable { - def roleStatus = role1Status - assert roleStatus.strictPlacement - final def (res0, outstanding0) = newRequest(roleStatus) - def entry = host1.getOrCreate(roleStatus.key) - entry.containerCompleted(false) - entry.containerCompleted(false) - entry.containerCompleted(false) - assert entry.failedRecently == 3 - final AMRMClient.ContainerRequest initialRequest = - outstanding0.buildContainerRequest(res0, roleStatus, 0, null) - assert !initialRequest.relaxLocality - assert initialRequest.nodes[0] == host1.hostname - } - /** * Create a new request (always against host1) * @param r role status
