SLIDER-401 slider-agent tests not running 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/a9f0b985 Tree: http://git-wip-us.apache.org/repos/asf/incubator-slider/tree/a9f0b985 Diff: http://git-wip-us.apache.org/repos/asf/incubator-slider/diff/a9f0b985 Branch: refs/heads/feature/SLIDER-149_Support_a_YARN_service_registry Commit: a9f0b985d7bab6387a028df3019d467a69a69626 Parents: 2d6331a Author: Steve Loughran <ste...@apache.org> Authored: Fri Sep 5 13:15:38 2014 +0100 Committer: Steve Loughran <ste...@apache.org> Committed: Fri Sep 5 13:15:38 2014 +0100 ---------------------------------------------------------------------- pom.xml | 1 + slider-agent/pom.xml | 4 +-- slider-agent/src/test/python/python-wrap | 40 ---------------------- slider-agent/src/test/python/python-wrap.sh | 42 ++++++++++++++++++++++++ slider-core/pom.xml | 4 +-- 5 files changed, 47 insertions(+), 44 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9f0b985/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9efb5c8..d9b3813 100644 --- a/pom.xml +++ b/pom.xml @@ -200,6 +200,7 @@ <maven-deploy-plugin.version>2.7</maven-deploy-plugin.version> <maven-doxia-module-markdown.version>1.4</maven-doxia-module-markdown.version> <maven-enforcer-plugin.version>1.0</maven-enforcer-plugin.version> + <maven-exec-plugin.version>1.2.1</maven-exec-plugin.version> <maven-jar-plugin.version>2.3.1</maven-jar-plugin.version> <maven.javadoc.version>2.8</maven.javadoc.version> <maven.project.version>2.4</maven.project.version> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9f0b985/slider-agent/pom.xml ---------------------------------------------------------------------- diff --git a/slider-agent/pom.xml b/slider-agent/pom.xml index f26cb11..48dd301 100644 --- a/slider-agent/pom.xml +++ b/slider-agent/pom.xml @@ -59,11 +59,11 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.2</version> + <version>${maven-exec-plugin.version}</version> <executions> <execution> <configuration> - <executable>${project.basedir}/src/test/python/python-wrap</executable> + <executable>python</executable> <workingDirectory>src/test/python</workingDirectory> <arguments> <argument>unitTests.py</argument> http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9f0b985/slider-agent/src/test/python/python-wrap ---------------------------------------------------------------------- diff --git a/slider-agent/src/test/python/python-wrap b/slider-agent/src/test/python/python-wrap deleted file mode 100755 index 40dc785..0000000 --- a/slider-agent/src/test/python/python-wrap +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env bash -# Copyright 2011 The Apache Software Foundation -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -export PYTHONPATH=/usr/lib/python2.6/site-packages/common_functions:$PYTHONPATH - -# reset settings -unset PYTHON - -# checking for preferable python versions -if [ -a /usr/bin/python2.7 ] && [ -z "$PYTHON" ]; then - PYTHON=/usr/bin/python2.7 -fi - -if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then - PYTHON=/usr/bin/python2.6 -fi - -# if no preferable python versions found, try to use system one -if [[ -z "$PYTHON" ]]; then - PYTHON=/usr/bin/python -fi - -# execute script -$PYTHON "$@" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9f0b985/slider-agent/src/test/python/python-wrap.sh ---------------------------------------------------------------------- diff --git a/slider-agent/src/test/python/python-wrap.sh b/slider-agent/src/test/python/python-wrap.sh new file mode 100755 index 0000000..8f30d67 --- /dev/null +++ b/slider-agent/src/test/python/python-wrap.sh @@ -0,0 +1,42 @@ +#!/usr/bin/env bash +# Copyright 2011 The Apache Software Foundation +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +export PYTHONPATH=/usr/lib/python2.7/site-packages/common_functions:$PYTHONPATH + +# reset settings +unset PYTHON + +# checking for preferable python versions +if [ -a /usr/bin/python2.7 ] && [ -z "$PYTHON" ]; then + PYTHON=/usr/bin/python2.7 + export PYTHONPATH=/usr/lib/python2.7/site-packages/common_functions:$PYTHONPATH +fi + +if [ -a /usr/bin/python2.6 ] && [ -z "$PYTHON" ]; then + PYTHON=/usr/bin/python2.6 + export PYTHONPATH=/usr/lib/python2.6/site-packages/common_functions:$PYTHONPATH +fi + +# if no preferable python versions found, try to use system one +if [[ -z "$PYTHON" ]]; then + PYTHON=/usr/bin/python +fi + +# execute script +$PYTHON "$@" http://git-wip-us.apache.org/repos/asf/incubator-slider/blob/a9f0b985/slider-core/pom.xml ---------------------------------------------------------------------- diff --git a/slider-core/pom.xml b/slider-core/pom.xml index cdcea38..326af88 100644 --- a/slider-core/pom.xml +++ b/slider-core/pom.xml @@ -538,7 +538,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> + <version>${maven-exec-plugin.version}</version> <configuration> <executable>java</executable> <arguments> @@ -562,7 +562,7 @@ <plugin> <groupId>org.codehaus.mojo</groupId> <artifactId>exec-maven-plugin</artifactId> - <version>1.2.1</version> + <version>${maven-exec-plugin.version}</version> <executions> <execution> <goals>
