summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2019-11-05 09:47:24 +0000
committerGerrit Code Review <review@openstack.org>2019-11-05 09:47:24 +0000
commit23e1dba5321662d3daf708fae54107b56419daac (patch)
treeb147f8399910c323a505f213195f0eb80e604476 /tox.ini
parent36e2d74f8df7af860f26c7edb842e06396c916f5 (diff)
parentc512574e110c214396658743e75ae497ba76e2ff (diff)
downloadswift-23e1dba5321662d3daf708fae54107b56419daac.tar.gz
Merge "Make our py2 func tests more explicitly py2"
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini12
1 files changed, 8 insertions, 4 deletions
diff --git a/tox.ini b/tox.ini
index 292f34a83..18567359d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,10 +40,6 @@ commands =
basepython = python3
commands = {[testenv:pep8]commands}
-[testenv:func]
-basepython = python2.7
-commands = ./.functests {posargs}
-
[testenv:func-py3]
basepython = python3
commands = ./.functests {posargs}
@@ -72,22 +68,30 @@ commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
+[testenv:func]
+basepython = python2.7
+commands = ./.functests {posargs}
+
[testenv:func-encryption]
+basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=encryption
[testenv:func-domain-remap-staticweb]
+basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
[testenv:func-ec]
+basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=ec
[testenv:func-s3api]
+basepython = python2.7
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1
SWIFT_TEST_IN_PROCESS_CONF_LOADER=s3api