Skip to content

Commit

Permalink
Merge "Fixed shebang kernel limitation with virtualenv during test run (
Browse files Browse the repository at this point in the history
  • Loading branch information
mcp-jenkins authored and Gerrit Code Review committed Feb 8, 2018
2 parents fd0f5f3 + 3cbeb96 commit 6572333
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,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_pillar() {
Expand Down Expand Up @@ -114,7 +114,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() {
Expand Down

0 comments on commit 6572333

Please sign in to comment.