diff options
| author | Zuul <zuul@review.opendev.org> | 2020-12-08 08:27:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-12-08 08:27:54 +0000 |
| commit | fe1f1e8271d3c6cdc773b447a55c6a5cdb3efd1d (patch) | |
| tree | d8132f503793d872189cba758d2b486f395cff13 | |
| parent | 232cb85cb9021f496e5edb5cf84f126b98554356 (diff) | |
| parent | 976cc8f482723a698160815affabb540e4d766eb (diff) | |
| download | swift-fe1f1e8271d3c6cdc773b447a55c6a5cdb3efd1d.tar.gz | |
Merge "Give unit tests a second chance to pass"
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | tox.ini | 16 |
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 @@ -14,11 +14,13 @@ deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -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:py27] @@ -98,6 +100,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 @@ -157,7 +161,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 |