Repository: incubator-slider Updated Branches: refs/heads/develop c8fb17e05 -> 227339e5c refs/heads/feature/SLIDER-82-pass-3 4e9a95b92 -> dd6073352
SLIDER-82 minor test source cleanup Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/da24357a Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/da24357a Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/da24357a Branch: refs/heads/feature/SLIDER-82-pass-3 Commit: da24357a4de4cdf1c494eaf830441fe49bf48355 Parents: 4e9a95b Author: Steve Loughran <[email protected]> Authored: Wed Nov 4 18:09:58 2015 +0000 Committer: Steve Loughran <[email protected]> Committed: Wed Nov 4 18:10:07 2015 +0000 ---------------------------------------------------------------------- .../model/appstate/TestMockAppStateAppRestIntegration.groovy | 5 ----- .../model/appstate/TestMockAppStateDynamicRoles.groovy | 6 ------ .../appmaster/model/appstate/TestMockAppStateFlexing.groovy | 3 +-- .../model/appstate/TestMockAppStateRMOperations.groovy | 4 +--- .../model/appstate/TestMockAppStateRebuildOnAMRestart.groovy | 3 +-- .../model/appstate/TestMockContainerResourceAllocations.groovy | 5 ----- 6 files changed, 3 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/da24357a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAppRestIntegration.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAppRestIntegration.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAppRestIntegration.groovy index d36fdbc..6739623 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAppRestIntegration.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateAppRestIntegration.groovy @@ -41,11 +41,6 @@ import org.junit.Test @Slf4j class TestMockAppStateAppRestIntegration extends BaseMockAppStateTest implements MockRoles { - @Override - String getTestName() { - return "TestMockAppStateAppRestIntegration" - } - @Test public void testCachedIntDocument() throws Throwable { ContentCache cache = new ContentCache() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/da24357a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy index e35f028..05b38ab 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateDynamicRoles.groovy @@ -20,23 +20,17 @@ package org.apache.slider.server.appmaster.model.appstate import groovy.transform.CompileStatic import groovy.util.logging.Slf4j -import org.apache.hadoop.conf.Configuration -import org.apache.hadoop.yarn.api.records.ContainerId import org.apache.slider.api.ResourceKeys import org.apache.slider.core.conf.AggregateConf import org.apache.slider.providers.PlacementPolicy import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest -import org.apache.slider.server.appmaster.model.mock.MockAppState import org.apache.slider.server.appmaster.model.mock.MockRoles import org.apache.slider.server.appmaster.model.mock.MockYarnEngine import org.apache.slider.server.appmaster.operations.AbstractRMOperation import org.apache.slider.server.appmaster.operations.ContainerRequestOperation -import org.apache.slider.server.appmaster.state.AppState -import org.apache.slider.server.appmaster.state.AppStateBindingInfo import org.apache.slider.server.appmaster.state.ContainerPriority import org.apache.slider.server.appmaster.state.RoleHistoryUtils import org.apache.slider.server.appmaster.state.RoleInstance -import org.apache.slider.server.appmaster.state.SimpleReleaseSelector import org.junit.Test /** http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/da24357a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexing.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexing.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexing.groovy index 257092a..548842c 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexing.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateFlexing.groovy @@ -20,7 +20,6 @@ package org.apache.slider.server.appmaster.model.appstate import groovy.util.logging.Slf4j import org.apache.hadoop.yarn.api.records.Container -import org.apache.slider.api.ClusterDescription import org.apache.slider.core.exceptions.TriggerClusterTeardownException import org.apache.slider.server.appmaster.model.mock.BaseMockAppStateTest import org.apache.slider.server.appmaster.model.mock.MockRoles @@ -76,7 +75,7 @@ class TestMockAppStateFlexing extends BaseMockAppStateTest implements MockRoles ops = appState.reviewRequestAndReleaseNodes() assert ops.empty - RoleInstance ri2 = appState.innerOnNodeManagerContainerStarted(target.id) + appState.innerOnNodeManagerContainerStarted(target.id) } @Test http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/da24357a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRMOperations.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRMOperations.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRMOperations.groovy index 9ac6fcf..ba7588a 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRMOperations.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRMOperations.groovy @@ -110,7 +110,6 @@ class TestMockAppStateRMOperations extends BaseMockAppStateTest implements MockR // four outstanding assert role0.requested == 4 - // flex cluster to 3 role0.desired = 3 ops = appState.reviewRequestAndReleaseNodes() @@ -226,8 +225,7 @@ class TestMockAppStateRMOperations extends BaseMockAppStateTest implements MockR public void testFlexUpNoSpace() throws Throwable { // engine only has two nodes, so > 2 will be outstanding engine = new MockYarnEngine(1, 2) - List<AbstractRMOperation> ops - // role: desired = 2, requested = 1, actual=1 + // role: desired = 2, requested = 1, actual=1 def role0 = role0Status role0.desired = 4 createAndSubmitNodes() http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/da24357a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy index 02052c2..59cc2c8 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockAppStateRebuildOnAMRestart.groovy @@ -36,8 +36,7 @@ import org.junit.Test */ @CompileStatic @Slf4j -class TestMockAppStateRebuildOnAMRestart extends BaseMockAppStateTest - implements MockRoles { +class TestMockAppStateRebuildOnAMRestart extends BaseMockAppStateTest implements MockRoles { @Override String getTestName() { http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/da24357a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockContainerResourceAllocations.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockContainerResourceAllocations.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockContainerResourceAllocations.groovy index ad607cf..93cce95 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockContainerResourceAllocations.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/model/appstate/TestMockContainerResourceAllocations.groovy @@ -38,11 +38,6 @@ import org.junit.Test @Slf4j class TestMockContainerResourceAllocations extends BaseMockAppStateTest { - @Override - String getTestName() { - "TestMockContainerResourceAllocations" - } - @Test public void testNormalAllocations() throws Throwable { ConfTree clusterSpec = factory.newConfTree(1, 0, 0)
