Merge branch 'feature/SLIDER-509-registry-funtests' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-slider/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-slider/commit/ac76781d Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/ac76781d Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/ac76781d Branch: refs/heads/develop Commit: ac76781d4054f9a8cf9f2dee4292e07eff5ad440 Parents: 0b0f762 d6ff425 Author: Steve Loughran <ste...@apache.org> Authored: Tue Oct 21 14:57:22 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Tue Oct 21 14:57:22 2014 +0100 ---------------------------------------------------------------------- slider-assembly/src/main/scripts/slider | 2 +- slider-assembly/src/main/scripts/slider.py | 3 +- .../org/apache/slider/client/SliderClient.java | 174 ++++++++++++------- .../slider/common/params/ActionExistsArgs.java | 7 +- .../apache/slider/common/params/Arguments.java | 1 + .../slider/common/tools/ConfigHelper.java | 16 +- .../apache/slider/common/tools/SliderUtils.java | 14 +- .../exceptions/BadClusterStateException.java | 2 +- .../core/exceptions/MissingArgException.java | 26 --- .../core/exceptions/NotFoundException.java | 35 ++++ .../core/launch/ClasspathConstructor.java | 2 +- .../server/appmaster/SliderAppMaster.java | 65 ++++--- .../slider/server/appmaster/rpc/RpcBinder.java | 2 +- .../rpc/SliderClusterProtocolProxy.java | 20 ++- .../agent/actions/TestActionExists.groovy | 8 +- .../standalone/TestStandaloneAMDestroy.groovy | 2 +- .../standalone/TestStandaloneAMKill.groovy | 2 +- .../standalone/TestStandaloneAgentAM.groovy | 6 +- .../TestStandaloneYarnRegistryAM.groovy | 102 +++++------ .../tools/TestClientResourceRegistration.groovy | 24 ++- .../apache/slider/test/SliderTestUtils.groovy | 173 ++++++++++++------ .../framework/AgentCommandTestBase.groovy | 8 +- .../funtest/framework/CommandTestBase.groovy | 56 ++++-- .../slider/funtest/framework/ConfLoader.groovy | 7 +- .../funtest/commands/ResolveCommandIT.groovy | 64 +++++++ .../funtest/commands/SimpleCommandsIT.groovy | 6 +- .../funtest/lifecycle/AMFailuresIT.groovy | 8 +- .../lifecycle/AgentClusterLifecycleIT.groovy | 7 +- .../funtest/lifecycle/AgentFailures2IT.groovy | 2 +- .../funtest/lifecycle/AgentFailuresIT.groovy | 2 +- .../funtest/lifecycle/AgentRegistryIT.groovy | 141 +++++++++++++++ .../funtest/lifecycle/AppsThroughAgentIT.groovy | 2 +- .../AppsThroughAgentQueueAndLabelsIT.groovy | 2 +- .../accumulo/AccumuloClientProvider.java | 2 +- .../providers/hbase/HBaseClientProvider.java | 2 +- 35 files changed, 720 insertions(+), 275 deletions(-) ----------------------------------------------------------------------
