x/swift3
Code Issues Proposed changes

Merge "tox: update swift version to 2.1.0"

Browse Source
This commit is contained in:
Jenkins 2014-09-03 12:47:15 +00:00 committed by Gerrit Code Review
commit e74328b288
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
swift3/test/functional/common.filter
View File

@ -116,16 +116,9 @@ _filter_header_content_length()
sed -e 's/^Content-Length: [0-9]*$/Content-Length: LENGTH/g' sed -e 's/^Content-Length: [0-9]*$/Content-Length: LENGTH/g'
} }
# This is not necessary after Swift merge swift3 patch
_filter_header_capitalization()
{
perl -pe '$_=lc($&).$'\'' if /^x-(amz|rgw)-.+?:/i' | \
perl -pe '$_="ETag:".$'\'' if /^etag:/i'
}
_filter_header() _filter_header()
{ {
_filter_header_capitalization | _filter_header_date | _filter_user | \ _filter_header_date | _filter_user | \
_filter_upload_id | _filter_version_id | _filter_txid | _filter_etag | \ _filter_upload_id | _filter_version_id | _filter_txid | _filter_etag | \
_filter_timestamp | _filter_header_content_length _filter_timestamp | _filter_header_content_length
} }

2
tox.ini
View File

@ -9,7 +9,7 @@ usedevelop = True
install_command = pip install {opts} {packages} install_command = pip install {opts} {packages}
deps = deps =
-r{toxinidir}/test-requirements.txt -r{toxinidir}/test-requirements.txt
https://launchpad.net/swift/juno/2.0.0/+download/swift-2.0.0.tar.gz https://launchpad.net/swift/juno/2.1.0/+download/swift-2.1.0.tar.gz
commands = nosetests {posargs:swift3/test/unit} commands = nosetests {posargs:swift3/test/unit}
setenv = VIRTUAL_ENV={envdir} setenv = VIRTUAL_ENV={envdir}
NOSE_WITH_OPENSTACK=1 NOSE_WITH_OPENSTACK=1