summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2019-08-07 16:16:57 -0700
committerTim Burke <tim.burke@gmail.com>2019-08-16 20:34:16 -0700
commit74db3670607d952e597011eb07676aedff521b41 (patch)
tree824d556917a68ee7d5b08057571d30b17f3b5b31 /tox.ini
parent9b4b57a8801d86e656b754930e74ac4087c1de8a (diff)
downloadswift-74db3670607d952e597011eb07676aedff521b41.tar.gz
py3: Finish porting func tests
We were (indirectly) importing swiftclient (and therefore requests and urllib3) before doing our eventlet monkey-patching. This would lead boto3 (which digs an SSLContext out of urllib3) to trip RecursionErrors on py3 similar to >>> from ssl import SSLContext, PROTOCOL_SSLv23 >>> import eventlet >>> eventlet.monkey_patch(socket=True) >>> SSLContext(PROTOCOL_SSLv23).options |= 0 Traceback (most recent call last): File "<stdin>", line 1, in <module> File "/usr/lib/python3.6/ssl.py", line 465, in options super(SSLContext, SSLContext).options.__set__(self, value) File "/usr/lib/python3.6/ssl.py", line 465, in options super(SSLContext, SSLContext).options.__set__(self, value) File "/usr/lib/python3.6/ssl.py", line 465, in options super(SSLContext, SSLContext).options.__set__(self, value) [Previous line repeated 330 more times] RecursionError: maximum recursion depth exceeded while calling a Python object Change-Id: I4bb59edd87336597791416c4f2a096efe0e72fe3
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini29
1 files changed, 5 insertions, 24 deletions
diff --git a/tox.ini b/tox.ini
index ade68e277..7d25a6acd 100644
--- a/tox.ini
+++ b/tox.ini
@@ -46,48 +46,29 @@ commands = ./.functests {posargs}
[testenv:func-py3]
basepython = python3
-commands =
- nosetests {posargs: \
- test/functional/s3api/test_acl.py \
- test/functional/s3api/test_multi_delete.py \
- test/functional/s3api/test_multi_upload.py \
- test/functional/s3api/test_object.py \
- test/functional/s3api/test_presigned.py \
- test/functional/s3api/test_service.py \
- test/functional/test_access_control.py \
- test/functional/test_account.py \
- test/functional/test_container.py \
- test/functional/test_dlo.py \
- test/functional/test_domain_remap.py \
- test/functional/test_object.py \
- test/functional/test_slo.py \
- test/functional/test_staticweb.py \
- test/functional/test_symlink.py \
- test/functional/test_tempurl.py \
- test/functional/test_versioned_writes.py \
- test/functional/tests.py}
+commands = ./.functests {posargs}
[testenv:func-ec-py3]
basepython = python3
-commands = {[testenv:func-py3]commands}
+commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
[testenv:func-s3api-py3]
basepython = python3
-commands = {[testenv:func-py3]commands}
+commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api
[testenv:func-encryption-py3]
basepython = python3
-commands = {[testenv:func-py3]commands}
+commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
[testenv:func-domain-remap-staticweb-py3]
basepython = python3
-commands = {[testenv:func-py3]commands}
+commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb