Skip to content

Commit f7d4743

Browse files
committed
Merge branch 'master' of github.com:mongodb/mongo-python-driver
2 parents 275b716 + bba5f81 commit f7d4743

File tree

2 files changed

+10
-3
lines changed

2 files changed

+10
-3
lines changed

.evergreen/run-import-time-test.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,9 @@ function get_import_time() {
2525
}
2626

2727
get_import_time $HEAD_SHA
28+
git stash
2829
git checkout $BASE_SHA
2930
get_import_time $BASE_SHA
3031
git checkout $HEAD_SHA
32+
git stash apply
3133
python tools/compare_import_time.py $HEAD_SHA $BASE_SHA

.evergreen/run-mod-wsgi-tests.sh

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ fi
1919
PYTHON_VERSION=$(${PYTHON_BINARY} -c "import sys; sys.stdout.write('.'.join(str(val) for val in sys.version_info[:2]))")
2020

2121
# Ensure the C extensions are installed.
22-
${PYTHON_BINARY} -m pip install -e .
22+
${PYTHON_BINARY} -m venv --system-site-packages .venv
23+
source .venv/bin/activate
24+
pip install -U pip
25+
python -m pip install -e .
2326

2427
export MOD_WSGI_SO=/opt/python/mod_wsgi/python_version/$PYTHON_VERSION/mod_wsgi_version/$MOD_WSGI_VERSION/mod_wsgi.so
2528
export PYTHONHOME=/opt/python/$PYTHON_VERSION
@@ -38,10 +41,12 @@ trap '$APACHE -k stop -f ${PROJECT_DIRECTORY}/test/mod_wsgi_test/${APACHE_CONFIG
3841
wget -t 1 -T 10 -O - "http://localhost:8080/interpreter1${PROJECT_DIRECTORY}" || (cat error_log && exit 1)
3942
wget -t 1 -T 10 -O - "http://localhost:8080/interpreter2${PROJECT_DIRECTORY}" || (cat error_log && exit 1)
4043

41-
${PYTHON_BINARY} ${PROJECT_DIRECTORY}/test/mod_wsgi_test/test_client.py -n 25000 -t 100 parallel \
44+
python ${PROJECT_DIRECTORY}/test/mod_wsgi_test/test_client.py -n 25000 -t 100 parallel \
4245
http://localhost:8080/interpreter1${PROJECT_DIRECTORY} http://localhost:8080/interpreter2${PROJECT_DIRECTORY} || \
4346
(tail -n 100 error_log && exit 1)
4447

45-
${PYTHON_BINARY} ${PROJECT_DIRECTORY}/test/mod_wsgi_test/test_client.py -n 25000 serial \
48+
python ${PROJECT_DIRECTORY}/test/mod_wsgi_test/test_client.py -n 25000 serial \
4649
http://localhost:8080/interpreter1${PROJECT_DIRECTORY} http://localhost:8080/interpreter2${PROJECT_DIRECTORY} || \
4750
(tail -n 100 error_log && exit 1)
51+
52+
rm -rf .venv

0 commit comments

Comments
 (0)