Code Review
/
salt-formulas
/
elasticsearch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Retry on index create in ES
[salt-formulas/elasticsearch.git]
/
tests
/
run_tests.sh
diff --git
a/tests/run_tests.sh
b/tests/run_tests.sh
index 29fb975b279dda0bb79359deb47abd82cbc59f6f..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
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() {
}
setup_mock_bin() {
@@
-124,8
+124,8
@@
clean() {
}
salt_run() {
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
-
salt-call
${SALT_OPTS} $*
+ [ -e ${VEN
V
_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+
python $(which salt-call)
${SALT_OPTS} $*
}
prepare() {
}
prepare() {