Browse Source

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

Change-Id: Ib5d56448772f4fef21f38573e5640534316e884d
master
Jakub Josef 6 years ago
parent
commit
b9539d6eae
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      tests/run_tests.sh

+ 2
- 2
tests/run_tests.sh View File

@@ -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}
}

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

Loading…
Cancel
Save