diff options
| -rwxr-xr-x | tools/test-setup.sh | 14 | ||||
| -rw-r--r-- | tox.ini | 82 |
2 files changed, 53 insertions, 43 deletions
diff --git a/tools/test-setup.sh b/tools/test-setup.sh index 54a115e..484fbe7 100755 --- a/tools/test-setup.sh +++ b/tools/test-setup.sh @@ -11,10 +11,10 @@ # this package here. # inspired from project-config install-distro-packages.sh -if apt-get -v >/dev/null 2>&1 ; then - sudo add-apt-repository -y ppa:qpid/testing - sudo apt-get -qq update - sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \ - apt-get -q --option "Dpkg::Options::=--force-confold" \ - --assume-yes install qdrouterd -fi +#if apt-get -v >/dev/null 2>&1 ; then +# sudo add-apt-repository -y ppa:qpid/testing +# sudo apt-get -qq update +# sudo PATH=/usr/sbin:/sbin:$PATH DEBIAN_FRONTEND=noninteractive \ +# apt-get -q --option "Dpkg::Options::=--force-confold" \ +# --assume-yes install qdrouterd +#fi @@ -1,21 +1,18 @@ [tox] minversion = 3.18.0 -envlist = py3,pep8 -ignore_basepython_conflict = true +envlist = py3, pep8 [testenv] -basepython = python3 -setenv = - VIRTUAL_ENV={envdir} -passenv = OS_* - ZUUL_CACHE_DIR - REQUIREMENTS_PIP_LOCATION -install_command = pip install {opts} {packages} +passenv = + OS_* + ZUUL_CACHE_DIR + REQUIREMENTS_PIP_LOCATION deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} -r{toxinidir}/test-requirements.txt -r{toxinidir}/requirements.txt -commands = stestr run --slowest {posargs} +commands = + stestr run --slowest {posargs} [testenv:pep8] commands = @@ -25,7 +22,7 @@ commands = [testenv:cover] setenv = - PYTHON=coverage run --source oslo_messaging --parallel-mode + PYTHON=coverage run --source oslo_messaging --parallel-mode commands = stestr run --slowest {posargs} coverage combine @@ -37,14 +34,15 @@ commands = {posargs} [testenv:docs] allowlist_externals = rm -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt commands = rm -fr doc/build sphinx-build -W --keep-going -b html doc/source doc/build/html -# # The following functional test scenarios are defined for the -# testing of the messaging backends and to demonstrated the functiona +# testing of the messaging backends and to demonstrated the functional # correctness across driver combinations (e.g. RPC and Notify) # # RPC Notify @@ -56,42 +54,50 @@ commands = # [testenv:py38-func-scenario01] setenv = - {[testenv]setenv} - SCENARIO=scenario01 -commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} + SCENARIO=scenario01 +allowlist_externals = + {toxinidir}/tools/setup-scenario-env.sh +commands = + {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} [testenv:py38-func-scenario02] setenv = - {[testenv]setenv} - SCENARIO=scenario02 -commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} + SCENARIO=scenario02 +allowlist_externals = + {toxinidir}/tools/setup-scenario-env.sh +commands = + {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} [testenv:py38-func-scenario03] setenv = - {[testenv]setenv} - SCENARIO=scenario03 - ENVNAME={envname} - WORKDIR={toxworkdir} -commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} + SCENARIO=scenario03 + ENVNAME={envname} + WORKDIR={toxworkdir} +allowlist_externals = + {toxinidir}/tools/setup-scenario-env.sh +commands = + {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} [testenv:py38-func-scenario04] setenv = - {[testenv]setenv} - SCENARIO=scenario04 - ENVNAME={envname} - WORKDIR={toxworkdir} -commands = {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} + SCENARIO=scenario04 + ENVNAME={envname} + WORKDIR={toxworkdir} +allowlist_externals = + {toxinidir}/tools/setup-scenario-env.sh +commands = + {toxinidir}/tools/setup-scenario-env.sh stestr run --slowest {posargs:oslo_messaging.tests.functional} [testenv:bandit] # NOTE(kgiusti): This is required for the integration test job of the bandit # project. Please do not remove. -commands = bandit -r oslo_messaging -x tests -n5 +commands = + bandit -r oslo_messaging -x tests -n5 [flake8] -# E731 skipped as assign a lambda expression - show-source = True enable-extensions = H203,H106 +# E731 skipped as assign a lambda expression ignore = E731,H405,W504 exclude = .tox,dist,doc,*.egg,build,__init__.py @@ -105,12 +111,16 @@ extension = paths = ./oslo_messaging/hacking [testenv:releasenotes] -allowlist_externals = rm +allowlist_externals = + rm commands = rm -rf releasenotes/build sphinx-build -a -E -W -d releasenotes/build/doctrees --keep-going -b html releasenotes/source releasenotes/build/html -deps = -r{toxinidir}/doc/requirements.txt +deps = + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -r{toxinidir}/doc/requirements.txt [testenv:bindep] -deps = bindep +deps = + bindep commands = bindep {posargs} |