diff options
| author | Tim Burke <tim.burke@gmail.com> | 2019-11-05 01:45:26 +0000 |
|---|---|---|
| committer | Tim Burke <tim.burke@gmail.com> | 2019-11-05 02:33:36 +0000 |
| commit | c512574e110c214396658743e75ae497ba76e2ff (patch) | |
| tree | fb35bef7147f4ea3700aff934c6b9b57d75ea625 /tox.ini | |
| parent | 739c3704107bd991493472c18bfe7ac5f933077c (diff) | |
| download | swift-c512574e110c214396658743e75ae497ba76e2ff.tar.gz | |
Make our py2 func tests more explicitly py2
...because otherwise, I think they might be running under py3 right now.
Change-Id: I96ad9e5ed87a7e08d06e889233730cec476d3af7
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 12 |
1 files changed, 8 insertions, 4 deletions
@@ -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 |