From: Jakub Josef <jakub.josef@gmail.com>
Date: Thu, 8 Feb 2018 12:22:16 +0000 (+0100)
Subject: Fixed shebang kernel limitation with virtualenv during test run (https://github.com... 
X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Finfluxdb.git;a=commitdiff_plain;h=571d626c53db7e762b3255ccbd850dc13dd91400

Fixed shebang kernel limitation with virtualenv during test run (https://github.com/pypa/virtualenv/issues/596)

Change-Id: Icd6ac120246086aa8f9d52600d45ff249f2a9327
---

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 4ee4e0f..9761585 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -39,7 +39,7 @@ setup_virtualenv() {
     log_info "Setting up Python virtualenv"
     virtualenv $VENV_DIR
     source ${VENV_DIR}/bin/activate
-    pip install salt${PIP_SALT_VERSION}
+    python -m pip install salt${PIP_SALT_VERSION}
 }
 
 setup_mock_bin() {
@@ -125,7 +125,7 @@ clean() {
 
 salt_run() {
     [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
-    salt-call ${SALT_OPTS} $*
+    python $(which salt-call) ${SALT_OPTS} $*
 }
 
 prepare() {