Code Review
/
salt-formulas
/
elasticsearch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
| inline |
side by side
(from parent 1:
f9429dc
)
Fixed shebang kernel limitation with virtualenv during test run (https://github.com...
02/15502/1
author
Jakub Josef
<jakub.josef@gmail.com>
Thu, 8 Feb 2018 12:22:14 +0000
(13:22 +0100)
committer
Jakub Josef
<jakub.josef@gmail.com>
Thu, 8 Feb 2018 12:22:14 +0000
(13:22 +0100)
Change-Id: Iedbd1ee502588f6454c660b3ffa9209d90a34bf5
tests/run_tests.sh
patch
|
blob
|
history
diff --git
a/tests/run_tests.sh
b/tests/run_tests.sh
index 4ee4e0f3a9fc82b726123ccead0110cd0257877f..976158582d91be1e42605aef36c41fc38dc06dcf 100755
(executable)
--- 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}
+ p
ython -m p
ip 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() {