X-Git-Url: https://gerrit.mcp.mirantis.com/gitweb?p=salt-formulas%2Felasticsearch.git;a=blobdiff_plain;f=tests%2Frun_tests.sh;h=0ab7d8199f1bc933d81dc3adcce70142740d25b7;hp=29fb975b279dda0bb79359deb47abd82cbc59f6f;hb=refs%2Fheads%2Frelease%2F2019.2.0;hpb=bd2e4ff35910f0fe5c13dbf44c54c3130873fa52 diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 29fb975..0ab7d81 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} 'msgpack<1' } setup_mock_bin() { @@ -124,8 +124,8 @@ clean() { } salt_run() { - [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate - salt-call ${SALT_OPTS} $* + [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate + python $(which salt-call) ${SALT_OPTS} $* } prepare() {