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
Raise ES disk space alert thresholds
[salt-formulas/elasticsearch.git]
/
tests
/
run_tests.sh
diff --git
a/tests/run_tests.sh
b/tests/run_tests.sh
index 4ee4e0f3a9fc82b726123ccead0110cd0257877f..0ab7d8199f1bc933d81dc3adcce70142740d25b7 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
- p
ip install salt${PIP_SALT_VERSION}
+ p
ython -m pip install salt${PIP_SALT_VERSION} 'msgpack<1'
}
setup_mock_bin() {
}
setup_mock_bin() {
@@
-125,7
+125,7
@@
clean() {
salt_run() {
[ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt_run() {
[ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
-
salt-call
${SALT_OPTS} $*
+
python $(which salt-call)
${SALT_OPTS} $*
}
prepare() {
}
prepare() {