summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2021-02-14 19:18:35 +0000
committerGerrit Code Review <review@openstack.org>2021-02-14 19:18:35 +0000
commit9b56a03a86972c255eb39351852c56be16132bcd (patch)
tree9560e8ad95b10d8cb6f83c08e399c272e4c91141
parent2e487b42d82ff866ec339ade6885c3c66455ab52 (diff)
parent067328c8dee7e42a14a5932197d5bd23db5eaca0 (diff)
downloadswift-9b56a03a86972c255eb39351852c56be16132bcd.tar.gz
Merge "Give unit tests a second chance to pass" into stable/ussuri
-rw-r--r--.gitignore1
-rw-r--r--tox.ini16
2 files changed, 11 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index b989cd547..f6a236df1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ MANIFEST
.testrepository/*
.stestr/*
+.noseids
subunit.log
test/probe/.noseids
RELEASENOTES.rst
diff --git a/tox.ini b/tox.ini
index 635d8d3d2..6fb74ce7c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -14,11 +14,13 @@ deps =
-c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri}
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
-commands = find {envdir} ( -type f -o -type l ) -name "*.py[co]" -delete
- find {envdir} -type d -name "__pycache__" -delete
- nosetests {posargs:test/unit}
-whitelist_externals = find
- rm
+commands =
+ find {envdir} ( -type f -o -type l ) -name "*.py[co]" -delete
+ find {envdir} -type d -name "__pycache__" -delete
+ bash -ec "nosetests {posargs:test/unit} --with-id || nosetests --failed"
+allowlist_externals =
+ bash
+ find
passenv = SWIFT_* *_proxy
[testenv:cover]
@@ -110,6 +112,8 @@ commands = sphinx-build -W -b html doc/source doc/build/html
# the API Ref to docs.openstack.org.
basepython = python3
deps = -r{toxinidir}/doc/requirements.txt
+allowlist_externals =
+ rm
commands =
rm -rf api-ref/build
sphinx-build -W -b html -d api-ref/build/doctrees api-ref/source api-ref/build/html
@@ -167,7 +171,7 @@ deps =
[testenv:pdf-docs]
basepython = python3
deps = {[testenv:docs]deps}
-whitelist_externals =
+allowlist_externals =
make
commands =
sphinx-build -W -b latex doc/source doc/build/pdf