x/swift3
Code Issues Proposed changes

Merge "Put nested virtualenv in $TMP"

Browse Source
This commit is contained in:
Jenkins 2016-12-09 20:15:55 +00:00 committed by Gerrit Code Review
commit 806f7bb500
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
swift3/test/functional/run_test.sh
View File

@ -124,6 +124,7 @@ if [ -z "$CEPH_TESTS" ]; then
coverage report coverage report
coverage html coverage html
else else
set -e
pushd ${TEST_DIR} pushd ${TEST_DIR}
git clone https://github.com/swiftstack/s3compat.git git clone https://github.com/swiftstack/s3compat.git
popd popd
@ -132,17 +133,18 @@ else
# ceph/s3-tests has some rather ancient requirements, # ceph/s3-tests has some rather ancient requirements,
# so drop into another virtualenv # so drop into another virtualenv
virtualenv venv VENV="$(mktemp -d)"
. venv/bin/activate virtualenv "$VENV"
. "$VENV/bin/activate"
pip install -r requirements.txt -r ceph-tests/requirements.txt pip install -r requirements.txt -r ceph-tests/requirements.txt
S3TEST_CONF="${CONF_DIR}/ceph-s3.conf" ./bin/run_ceph_tests.py S3TEST_CONF="${CONF_DIR}/ceph-s3.conf" ./bin/run_ceph_tests.py || true
# show report # show report
./bin/get_ceph_test_attributes.py ./bin/get_ceph_test_attributes.py
./bin/report.py --detailed output/ceph-s3.out.yaml \ ./bin/report.py --detailed output/ceph-s3.out.yaml \
--known-failures "${CONF_DIR}/ceph-known-failures-${AUTH}.yaml" \ --known-failures "${CONF_DIR}/ceph-known-failures-${AUTH}.yaml" \
--detailedformat console output/ceph-s3.out.xml | \ --detailedformat console output/ceph-s3.out.xml | \
tee "${LOG_DEST:-${TEST_DIR}/log}/ceph-s3-summary.log" tee "${LOG_DEST:-${TEST_DIR}/log}/ceph-s3-summary.log"
# the report's exit code indicates NEW_FAILUREs / UNEXPECTED_PASSes # the report's exit code indicates NEW_FAILUREs / UNEXPECTED_PASSes
@ -150,6 +152,8 @@ else
cp output/ceph-s3.out.xml "${LOG_DEST:-${TEST_DIR}/log}/ceph-s3-details.xml" cp output/ceph-s3.out.xml "${LOG_DEST:-${TEST_DIR}/log}/ceph-s3-details.xml"
popd popd
rm -rf "$VENV"
set +e
fi fi
# cleanup # cleanup