Merge branch 'feature/SLIDER-616_re-enable_AMFailuresIT' 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/b39a7338 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/b39a7338 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/b39a7338 Branch: refs/heads/develop Commit: b39a733836730fdc5bd7ec4e7200d18aa1dee5ea Parents: 81ee39b 2b8dd55 Author: Steve Loughran <[email protected]> Authored: Thu Nov 6 14:40:00 2014 +0000 Committer: Steve Loughran <[email protected]> Committed: Thu Nov 6 14:40:00 2014 +0000 ---------------------------------------------------------------------- .../apache/slider/test/SliderTestUtils.groovy | 23 +- slider-funtest/pom.xml | 4 +- .../framework/AgentCommandTestBase.groovy | 3 +- .../funtest/framework/CommandTestBase.groovy | 248 +++++++++++++++++-- .../funtest/lifecycle/AMFailuresIT.groovy | 48 +--- .../lifecycle/AgentClusterLifecycleIT.groovy | 6 +- .../funtest/lifecycle/AgentFailures2IT.groovy | 2 +- .../funtest/lifecycle/AgentFailuresIT.groovy | 2 +- .../lifecycle/AgentLaunchFailureIT.groovy | 2 +- .../funtest/lifecycle/AgentRegistryIT.groovy | 8 +- .../lifecycle/AppsThroughAgentDemo.groovy | 139 +---------- .../funtest/lifecycle/AppsThroughAgentIT.groovy | 122 ++++----- .../AppsThroughAgentQueueAndLabelsIT.groovy | 2 +- 13 files changed, 325 insertions(+), 284 deletions(-) ----------------------------------------------------------------------
