Merge branch 'feature/SLIDER-540_Command_Test_Base_to_set_up_HADOOP_CONF_DIR' 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/df413bf2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/df413bf2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/df413bf2 Branch: refs/heads/develop Commit: df413bf2858a95f2485af0ededb97c918bc00e52 Parents: ff7b8c3 1ce0716 Author: Steve Loughran <ste...@apache.org> Authored: Mon Oct 20 12:37:20 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Mon Oct 20 12:37:20 2014 +0100 ---------------------------------------------------------------------- .../common/params/ActionDiagnosticArgs.java | 10 +-- .../slider/common/params/SliderActions.java | 1 + .../slider/common/tools/ConfigHelper.java | 39 ++++++++++-- .../abstracttests/AbstractTestBuildSetup.groovy | 1 - .../funtest/framework/CommandTestBase.groovy | 63 +++++++++++++++---- .../slider/funtest/framework/ConfLoader.groovy | 55 ++++++++++++++++- .../funtest/framework/FuntestProperties.groovy | 9 ++- .../slider/funtest/framework/SliderShell.groovy | 65 ++++++++++++++++---- 8 files changed, 204 insertions(+), 39 deletions(-) ----------------------------------------------------------------------
