Skip to content

Commit 82f03cf

Browse files
committed
Use venv/bin/activate in the test block to apply hack
1 parent 9a1516e commit 82f03cf

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

.circleci/config.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,17 @@ jobs:
3333
echo "Setting up custom pack testing environment with tests/setup_testing_env.sh"
3434
source ~/virtualenv/bin/activate
3535
tests/setup_testing_env.sh
36-
set -x
37-
which nosetests
38-
# eventlet monkey_patch as early as possible (has to be in activate as nosetests gets reinstalled during test phase)
39-
echo "grep -q monkey_patch $(which nosetests) || sed -i -e '/^import re$/i from st2common.util.monkey_patch import monkey_patch\nmonkey_patch()' $(which nosetests)" >> ~/virtualenv/bin/activate
4036
- run:
4137
name: Run tests (Python 3.6)
4238
# NOTE: We don't want to use default "-e" option because this means
4339
# step will fail immediately on one of the commands failures and we
4440
# can't intercept the error and cause non-fatal exit in case pack
4541
# doesn't declare support for Python 3
4642
shell: /bin/bash
47-
command: ~/ci/.circle/test ; ~/ci/.circle/exit_on_py3_checks $?
43+
# eventlet monkey_patch as early as possible (has to be in activate as nosetests gets reinstalled during test phase)
44+
command: |
45+
echo "grep -q monkey_patch ~/virtualenv/bin/nosetests || sed -i -e '/^import re$/i from st2common.util.monkey_patch import monkey_patch\nmonkey_patch()' ~/virtualenv/bin/nosetests" >> ~/virtualenv/bin/activate
46+
~/ci/.circle/test ; ~/ci/.circle/exit_on_py3_checks $?
4847
- save_cache:
4948
key: v1-dependency-cache-py36-{{ checksum "requirements.txt" }}
5049
paths:

0 commit comments

Comments
 (0)