You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@slider.apache.org by st...@apache.org on 2014/06/03 14:14:37 UTC
[4/5] git commit: SLIDER-111 SLIDER-112 Merge branches Conflicts:
slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy
slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionList.groovy
SLIDER-111 SLIDER-112 Merge branches
Conflicts:
slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy
slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionList.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/10fc8743
Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/10fc8743
Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/10fc8743
Branch: refs/heads/develop
Commit: 10fc8743806bc5fde4e66eeced10616ec962c102
Parents: e27a241 b9aac1a
Author: Steve Loughran <st...@apache.org>
Authored: Tue Jun 3 13:14:10 2014 +0100
Committer: Steve Loughran <st...@apache.org>
Committed: Tue Jun 3 13:14:10 2014 +0100
----------------------------------------------------------------------
.../org/apache/slider/agent/actions/TestActionExists.groovy | 8 ++++----
.../org/apache/slider/agent/actions/TestActionList.groovy | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/10fc8743/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy
----------------------------------------------------------------------
diff --cc slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy
index c982659,d150658..cb05fd0
--- a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionExists.groovy
@@@ -62,7 -62,7 +62,7 @@@ class TestActionExists extends AgentMin
Arguments.ARG_MANAGER, RMAddr
],
)
-- Assert.fail("expected an exception, got a status code "+ launcher.serviceExitCode)
++ fail("expected an exception, got a status code "+ launcher.serviceExitCode)
} catch (UnknownApplicationInstanceException e) {
}
@@@ -71,11 -71,11 +71,11 @@@
@Test
public void testExistsLiveCluster() throws Throwable {
//launch the cluster
- String clustername = "test_exists_live_cluster"
- ServiceLauncher launcher = createMasterlessAM(clustername, 0, true, false)
+ String clustername = createClusterName()
- ServiceLauncher launcher = createMasterlessAM(clustername, 0, true, false)
++ ServiceLauncher<SliderClient> launcher = createMasterlessAM(clustername, 0, true, false)
SliderClient sliderClient = launcher.service
addToTeardown(launcher)
-- ApplicationReport report = waitForClusterLive((SliderClient) launcher.service)
++ ApplicationReport report = waitForClusterLive(sliderClient)
// exists holds when cluster is running
launcher = launchClientAgainstMiniMR(
@@@ -103,7 -103,7 +103,7 @@@
],
)
-- SliderTestUtils.assertSucceeded(launcher)
++ assertSucceeded(launcher)
// assert that the cluster exists
http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/10fc8743/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionList.groovy
----------------------------------------------------------------------
diff --cc slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionList.groovy
index b1963dc,3d74fd6..66fdc15
--- a/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionList.groovy
+++ b/slider-core/src/test/groovy/org/apache/slider/agent/actions/TestActionList.groovy
@@@ -135,7 -135,7 +135,7 @@@ class TestActionList extends AgentMiniC
//varargs list of command line params
[
SliderActions.ACTION_LIST,
- "teststatusmissingcluster"
- "test_status_missing_cluster"
++ createClusterName()
]
)
fail("expected an exception, got a status code " + launcher.serviceExitCode)