Repository: incubator-slider Updated Branches: refs/heads/develop e74e7fe08 -> db16e03d4
SLIDER-622 jenkins failing on windows Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/0dea0dc3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/0dea0dc3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/0dea0dc3 Branch: refs/heads/develop Commit: 0dea0dc3a806c9ecea1bea33bcb30fdf1885d0b3 Parents: b181630 Author: Steve Loughran <[email protected]> Authored: Fri Nov 7 19:53:05 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Fri Nov 7 19:53:05 2014 +0000 ---------------------------------------------------------------------- .../slider/agent/standalone/TestStandaloneAgentAM.groovy | 9 ++++++--- .../slider/providers/agent/TestAgentAMManagementWS.groovy | 4 ++-- .../server/appmaster/TestDelayInContainerLaunch.groovy | 4 ++-- .../groovy/org/apache/slider/test/SliderTestBase.groovy | 5 +---- .../groovy/org/apache/slider/test/SliderTestUtils.groovy | 3 ++- 5 files changed, 13 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy index f04583e..ce726f9 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAgentAM.groovy @@ -165,8 +165,11 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { clustername) assert instance3.yarnApplicationState >= YarnApplicationState.FINISHED + // destroy it + client.actionDestroy(clustername) + //create another AM, this time with a port range - setSliderClientClassName(TestSliderClient.name) + sliderClientClassName = ExtendedSliderClient.name try { launcher = createStandaloneAM(clustername, true, true) client = launcher.service @@ -180,12 +183,12 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { assert 0 == clusterActionFreeze(client, clustername) } finally { - setSliderClientClassName(SliderClient.name) + sliderClientClassName = DEFAULT_SLIDER_CLIENT } } - static class TestSliderClient extends SliderClient { + static class ExtendedSliderClient extends SliderClient { @Override protected void persistInstanceDefinition(boolean overwrite, Path appconfdir, http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy index 7434c4e..887ca89 100644 --- a/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/providers/agent/TestAgentAMManagementWS.groovy @@ -124,7 +124,7 @@ class TestAgentAMManagementWS extends AgentTestBase { assert agt_ver_path.exists() assert agt_conf_path.exists() try { - setSliderClientClassName(TestSliderClient.name) + sliderClientClassName = TestSliderClient.name ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername, roles, [ @@ -174,7 +174,7 @@ class TestAgentAMManagementWS extends AgentTestBase { //TODO: assert failure as actual agent is not started. This test only starts the AM. assert RegistrationStatus.FAILED == response.getResponseStatus(); } finally { - setSliderClientClassName(SliderClient.name) + sliderClientClassName = DEFAULT_SLIDER_CLIENT } } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy index 973d3af..f32b843 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/TestDelayInContainerLaunch.groovy @@ -100,7 +100,7 @@ class TestDelayInContainerLaunch extends AgentTestBase { long delay = 30 TestDelayingSliderClient.delay = delay - setSliderClientClassName(TestDelayingSliderClient.name) + sliderClientClassName = TestDelayingSliderClient try { ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername, roles, @@ -134,7 +134,7 @@ class TestDelayInContainerLaunch extends AgentTestBase { assert duration/1000 >= delay } finally { - setSliderClientClassName(SliderClient.name) + sliderClientClassName = DEFAULT_SLIDER_CLIENT } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy index afb07d8..e0798a4 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestBase.groovy @@ -27,7 +27,6 @@ import org.junit.BeforeClass import org.junit.Rule import org.junit.rules.TestName -//import java.nio.file.Files /** * Base class for unit tests as well as ones starting mini clusters @@ -54,10 +53,8 @@ public abstract class SliderTestBase extends SliderTestUtils { @Before public void setup() { + sliderClientClassName = DEFAULT_SLIDER_CLIENT FileUtil.fullyDelete(new File(SliderXMLConfKeysForTesting.TEST_SECURITY_DIR)) } - - - } http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/0dea0dc3/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy index 3b1d022..e67145e 100644 --- a/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/test/SliderTestUtils.groovy @@ -64,7 +64,8 @@ import static Arguments.ARG_OPTION @Slf4j @CompileStatic class SliderTestUtils extends Assert { - static String sliderClientClassName = SliderClient.class.name + public static final String DEFAULT_SLIDER_CLIENT = SliderClient.class.name + static String sliderClientClassName = DEFAULT_SLIDER_CLIENT public static void describe(String s) { log.info("");
