Merge "py3: mostly port s3 func tests"

1 files changed, 12 insertions, 0 deletions

diff --git a/tox.ini b/tox.ini
index 44b0bee28..da3a068ba 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,6 +48,12 @@ commands = ./.functests {posargs}
 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_domain_remap.py \
     test/functional/test_object.py \
@@ -63,6 +69,12 @@ commands = {[testenv:func-py3]commands}
 setenv = SWIFT_TEST_IN_PROCESS=1
          SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
 
+[testenv:func-s3api-py3]
+basepython = python3
+commands = {[testenv:func-py3]commands}
+setenv = SWIFT_TEST_IN_PROCESS=1
+         SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api
+
 [testenv:func-encryption-py3]
 basepython = python3
 commands = {[testenv:func-py3]commands}