summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorTim Burke <tim.burke@gmail.com>2019-03-26 13:02:24 -0700
committerTim Burke <tim.burke@gmail.com>2019-07-10 09:51:38 -0700
commit9d1b7497400e8c3a7159b11dd8455c55a31db985 (patch)
treecc19211cbf708281ee528c5ce0820f66ff45e325 /tox.ini
parent1be4be810aa7d4ff664f7fe89fef0a5fa5f4b581 (diff)
downloadswift-9d1b7497400e8c3a7159b11dd8455c55a31db985.tar.gz
py3: port staticweb and domain_remap func tests
Drive-by: Tighten domain_remap assertions on listings, which required that we fix proxy pipeline placement. Add a note about it to the sample config. Change-Id: I41835148051294088a2c0fb4ed4e7a7b61273e5f
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini8
1 files changed, 8 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index bbcf62496..e4e8efa2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -48,10 +48,18 @@ commands = ./.functests {posargs}
basepython = python3
commands =
nosetests {posargs: \
+ test/functional/test_domain_remap.py \
+ test/functional/test_staticweb.py \
test/functional/test_symlink.py \
test/functional/test_tempurl.py \
test/functional/tests.py}
+
+[testenv:func-domain-remap-staticweb-py3]
+basepython = python3
+commands = {[testenv:func-py3]commands}
+setenv = SWIFT_TEST_IN_PROCESS=1
+ SWIFT_TEST_IN_PROCESS_CONF_LOADER=domain_remap_staticweb
[testenv:func-encryption]
commands = ./.functests {posargs}
setenv = SWIFT_TEST_IN_PROCESS=1