SLIDER-639 workarounds for 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/010127ab Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/010127ab Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/010127ab Branch: refs/heads/releases/slider-0.60 Commit: 010127abf16c630331e86ae68f4219a92565ad4e Parents: 56e16c3 Author: Steve Loughran <[email protected]> Authored: Tue Nov 11 15:27:56 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Tue Nov 11 15:33:44 2014 +0000 ---------------------------------------------------------------------- .../agent/standalone/TestStandaloneAMDestroy.groovy | 2 ++ .../agent/standalone/TestStandaloneAgentAM.groovy | 13 +++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/010127ab/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy index d25396d..164f609 100644 --- a/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/agent/standalone/TestStandaloneAMDestroy.groovy @@ -44,6 +44,8 @@ class TestStandaloneAMDestroy extends AgentMiniClusterTestBase { @Test public void testStandaloneAMDestroy() throws Throwable { + skipOnWindows() + String clustername = createMiniCluster("", configuration, 1, true) describe "create a Standalone AM, stop it, try to create" + http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/010127ab/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 93547f1..c31e9d3 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 @@ -129,7 +129,8 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { sleep(5000) //create another AM - launcher = createStandaloneAM(clustername, true, true) + def newcluster = clustername + "2" + launcher = createStandaloneAM(newcluster, true, true) client = launcher.service ApplicationId i2AppID = client.applicationId @@ -140,13 +141,13 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { //but when we look up an instance, we get the new App ID ApplicationReport instance2 = serviceRegistryClient.findInstance( - clustername) + newcluster) assert i2AppID == instance2.applicationId describe("attempting to create instance #3") //now try to create instance #3, and expect an in-use failure try { - createStandaloneAM(clustername, false, true) + createStandaloneAM(newcluster, false, true) fail("expected a failure, got a standalone AM") } catch (SliderException e) { assertFailureClusterInUse(e); @@ -160,7 +161,7 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { describe("Stopping instance #2") //now stop that cluster - assert 0 == clusterActionFreeze(client, clustername) + assert 0 == clusterActionFreeze(client, newcluster) logApplications(client.listSliderInstances(username)) @@ -173,11 +174,11 @@ class TestStandaloneAgentAM extends AgentMiniClusterTestBase { ApplicationReport instance3 = serviceRegistryClient.findInstance( - clustername) + newcluster) assert instance3.yarnApplicationState >= YarnApplicationState.FINISHED // destroy it - client.actionDestroy(clustername) + client.actionDestroy(newcluster) }
