diff options
| author | Matt Clay <matt@mystile.com> | 2019-06-03 23:16:16 +0200 |
|---|---|---|
| committer | Matt Clay <matt@mystile.com> | 2019-06-04 00:23:04 +0200 |
| commit | 858e3a7272c5545700f6ed71166e31725639b23a (patch) | |
| tree | 577d866267a97089f3438c87fe56e5d6672ec953 /test/integration/targets/old_style_cache_plugins | |
| parent | Added sort option for zabbix_screen module (#56237) (diff) | |
| download | ansible-858e3a7272c5545700f6ed71166e31725639b23a.tar.xz ansible-858e3a7272c5545700f6ed71166e31725639b23a.zip | |
Correct virtualenv usage in integration tests.
Diffstat (limited to 'test/integration/targets/old_style_cache_plugins')
| -rwxr-xr-x | test/integration/targets/old_style_cache_plugins/runme.sh | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/test/integration/targets/old_style_cache_plugins/runme.sh b/test/integration/targets/old_style_cache_plugins/runme.sh index 221d1db09b..13911bd55b 100755 --- a/test/integration/targets/old_style_cache_plugins/runme.sh +++ b/test/integration/targets/old_style_cache_plugins/runme.sh @@ -1,19 +1,8 @@ #!/usr/bin/env bash -# We don't set -u here, due to pypa/virtualenv#150 -set -ex +set -eux -MYTMPDIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'mytmpdir') - -trap 'rm -rf "${MYTMPDIR}"' EXIT - -# This is needed for the ubuntu1604py3 tests -# Ubuntu patches virtualenv to make the default python2 -# but for the python3 tests we need virtualenv to use python3 -PYTHON=${ANSIBLE_TEST_PYTHON_INTERPRETER:-python} - -virtualenv --system-site-packages --python "${PYTHON}" "${MYTMPDIR}/redis-cache" -source "${MYTMPDIR}/redis-cache/bin/activate" +source virtualenv.sh # Run test if dependencies are installed failed_dep_1=$(ansible localhost -m pip -a "name=redis>=2.4.5 state=present" "$@" | tee out.txt | grep -c 'FAILED!' || true) |