Browse Source

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

Change-Id: I3968ae934038e2bedb4efedd75491bec20ac8bf4
pull/144/head
Jakub Josef 6 years ago
parent
commit
8e994f935c
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      tests/run_tests.sh

+ 2
- 2
tests/run_tests.sh View File

log_info "Setting up Python virtualenv" log_info "Setting up Python virtualenv"
virtualenv $VENV_DIR virtualenv $VENV_DIR
source ${VENV_DIR}/bin/activate source ${VENV_DIR}/bin/activate
pip install salt${PIP_SALT_VERSION}
python -m pip install salt${PIP_SALT_VERSION}
} }


setup_pillar() { setup_pillar() {


salt_run() { salt_run() {
[ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
python $(which salt-call) ${SALT_OPTS} $*
} }


prepare() { prepare() {

Loading…
Cancel
Save