Bläddra i källkod

Merge "Fixed shebang kernel limitation with virtualenv during test run (https://github.com/pypa/virtualenv/issues/596)"

pull/144/head
mcp-jenkins 6 år sedan
förälder
incheckning
10edb594c8
1 ändrade filer med 2 tillägg och 2 borttagningar
  1. +2
    -2
      tests/run_tests.sh

+ 2
- 2
tests/run_tests.sh Visa fil

@@ -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() {
@@ -111,7 +111,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() {

Laddar…
Avbryt
Spara