Repository: incubator-slider Updated Branches: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows 475507b59 -> 4ca25b2c5
SLIDER-352 TestPublisherRestResources failing on 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/4ca25b2c Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/4ca25b2c Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/4ca25b2c Branch: refs/heads/feature/SLIDER-350-slider-core_tests_failing_on_windows Commit: 4ca25b2c535bd8ebbb8d92b318436dffe778754f Parents: 475507b Author: Steve Loughran <ste...@apache.org> Authored: Fri Aug 22 16:33:07 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Aug 22 16:33:07 2014 +0100 ---------------------------------------------------------------------- .../web/rest/publisher/TestPublisherRestResources.groovy | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/4ca25b2c/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy ---------------------------------------------------------------------- diff --git a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy index c1732e6..7dbd3e2 100644 --- a/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy +++ b/slider-core/src/test/groovy/org/apache/slider/server/appmaster/web/rest/publisher/TestPublisherRestResources.groovy @@ -65,14 +65,15 @@ class TestPublisherRestResources extends AgentTestBase { assert app_def_path.exists() assert agt_ver_path.exists() assert agt_conf_path.exists() + ServiceLauncher<SliderClient> launcher = buildAgentCluster(clustername, roles, [ ARG_PROVIDER, "org.apache.slider.server.appmaster.web.rest.publisher.TestSliderProviderFactory", ARG_OPTION, PACKAGE_PATH, slider_core.absolutePath, - ARG_OPTION, APP_DEF, "file://" + app_def_path.absolutePath, - ARG_OPTION, AGENT_CONF, "file://" + agt_conf_path.absolutePath, - ARG_OPTION, AGENT_VERSION, "file://" + agt_ver_path.absolutePath + ARG_OPTION, APP_DEF, toFileURI(app_def_path), + ARG_OPTION, AGENT_CONF, toFileURI(agt_conf_path), + ARG_OPTION, AGENT_VERSION, toFileURI(agt_ver_path) ], true, true, true) @@ -142,4 +143,8 @@ class TestPublisherRestResources extends AgentTestBase { assert !uris.any {it =~ /foo-bar/} } + public String toFileURI(File filename) { + "file://" + filename.absolutePath + } + }
