Don't install python for unit tests

- Unit tests are run in non-standard environments
- Avoid polluting unit test environment with excess pythons
- Add override environment variable to prevent python installation

Author: Gerg

bin/detect

@@ -32,10 +32,12 @@ if [ "$CF_STACK" != "cflinuxfs3" ]; then
 fi
 
 # To avoid having to support both python 2 & 3 and to avoid using the ancient
-# python included in cflinuxfs3, always install python
-PYTHON_DIR="/tmp/php-buildpack/python"
-mkdir -p "${PYTHON_DIR}"
-source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null
+# python included in cflinuxfs3, always install python, unless running unit tests
+if [ -z "${USE_SYSTEM_PYTHON}" ]; then
+  PYTHON_DIR="/tmp/php-buildpack/python"
+  mkdir -p "${PYTHON_DIR}"
+  source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null
+fi
 
 export PYTHONPATH=$BP/lib
 VERSION="$(cat "$BP"/VERSION)"

bin/finalize

@@ -32,13 +32,15 @@ PROFILE_DIR=${5:-}
 # Generally stacks do not have ruby or python installed, with the exception of cflinuxfs3, so we install them here
 #
 # We skip re-installing ruby on the cflinuxfs3 stack to avoid compatibility issues
-if [ "$CF_STACK" != "cflinuxfs3" ] && [ -z "${USE_SYSTEM_RUBY_PYTHON}" ]; then
+if [ "$CF_STACK" != "cflinuxfs3" ]; then
   source "$BP/bin/install-ruby" "$DEPS_DIR/$DEPS_IDX" "$BP"
 fi
 
 # To avoid having to support both python 2 & 3 and to avoid using the ancient
 # python included in cflinuxfs3, always install python
-source "$BP/bin/install-python" "$DEPS_DIR/$DEPS_IDX" "$BP"
+if [ -z "${USE_SYSTEM_PYTHON}" ]; then
+  source "$BP/bin/install-python" "$DEPS_DIR/$DEPS_IDX" "$BP"
+fi
 
 BUILDPACK_PATH=$BP
 export BUILDPACK_PATH

bin/release

@@ -33,10 +33,12 @@ if [ "$CF_STACK" != "cflinuxfs3" ]; then
 fi
 
 # To avoid having to support both python 2 & 3 and to avoid using the ancient
-# python included in cflinuxfs3, always install python
-PYTHON_DIR="/tmp/php-buildpack/python"
-mkdir -p "${PYTHON_DIR}"
-source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null
+# python included in cflinuxfs3, always install python, unless running unit tests
+if [ -z "${USE_SYSTEM_PYTHON}" ]; then
+  PYTHON_DIR="/tmp/php-buildpack/python"
+  mkdir -p "${PYTHON_DIR}"
+  source "$BP/bin/install-python" "$PYTHON_DIR" "$BP" &> /dev/null
+fi
 
 export PYTHONPATH=$BP/lib
 

run_tests.sh

@@ -9,6 +9,6 @@
 set -e
 for TEST in ./tests/*.py; do
     echo "Running test [$TEST]..."
-    nosetests --verbose --detailed-errors --nocapture "$@" "$TEST"
+    USE_SYSTEM_PYTHON=1 nosetests --verbose --detailed-errors --nocapture "$@" "$TEST"
     echo
 done

src/php/unit/compile_test.go

@@ -20,7 +20,7 @@ var _ = Describe("Compile", func() {
 			Expect(err).NotTo(HaveOccurred())
 
 			if IsDockerAvailable() {
-				cmd = exec.Command("docker", "run", "--rm", "-e", "'CF_STACK=unsupported'", "-v", bpDir+":/buildpack:ro", "-w", "/buildpack", "cloudfoundry/cflinuxfs3", "./bin/compile", "/tmp/abcd", "/tmp/efgh")
+				cmd = exec.Command("docker", "run", "--rm", "-e", "'CF_STACK=unsupported'", "-e", "USE_SYSTEM_PYTHON=1", "-v", bpDir+":/buildpack:ro", "-w", "/buildpack", "cloudfoundry/cflinuxfs3", "./bin/compile", "/tmp/abcd", "/tmp/efgh")
 			} else {
 				cmd = exec.Command("./bin/compile", "/tmp/abcd", "/tmp/efgh")
 				cmd.Env = append(os.Environ(), "CF_STACK=unsupported")