From c07f00594018241fa27ff819afb9de7fd2ec1051 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 30 Jun 2016 13:38:39 +0200 Subject: [PATCH] Remove unused test setup This repository does not run any tests, it only contains documentation. Remove unused content. Note that the removed constraint setup is a setup that is not supported since several months, we changed how this is done. Change-Id: I9a77957b323ec999cdc5b0fc57dd68da3b49d569 --- .testr.conf | 7 ------- test-requirements.txt | 7 ------- tox.ini | 49 ++++--------------------------------------- 3 files changed, 4 insertions(+), 59 deletions(-) delete mode 100644 .testr.conf diff --git a/.testr.conf b/.testr.conf deleted file mode 100644 index 6d83b3c..0000000 --- a/.testr.conf +++ /dev/null @@ -1,7 +0,0 @@ -[DEFAULT] -test_command=OS_STDOUT_CAPTURE=${OS_STDOUT_CAPTURE:-1} \ - OS_STDERR_CAPTURE=${OS_STDERR_CAPTURE:-1} \ - OS_TEST_TIMEOUT=${OS_TEST_TIMEOUT:-60} \ - ${PYTHON:-python} -m subunit.run discover -t ./ . $LISTOPT $IDOPTION -test_id_option=--load-list $IDFILE -test_list_option=--list diff --git a/test-requirements.txt b/test-requirements.txt index 4d93659..5a48bff 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,12 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking<0.11,>=0.10.0 - -python-subunit>=0.0.18 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 diff --git a/tox.ini b/tox.ini index 53a7b34..d43fd8e 100644 --- a/tox.ini +++ b/tox.ini @@ -1,60 +1,19 @@ [tox] minversion = 1.8 -envlist = py34-constraints,py27-constraints,pypy-constraints,pep8-constraints +envlist = py34,py27 skipsdist = True [testenv] usedevelop = True -install_command = - constraints: {[testenv:common-constraints]install_command} - pip install -U {opts} {packages} +install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} deps = -r{toxinidir}/test-requirements.txt -commands = python setup.py test --slowest --testr-args='{posargs}' - -[testenv:common-constraints] -install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages} - -[testenv:pep8] -commands = flake8 {posargs} - -[testenv:pep8-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = flake8 {posargs} +commands = true [testenv:venv] +install_command = pip install -U {opts} {packages} commands = {posargs} -[testenv:venv-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = {posargs} - -[testenv:cover] -commands = python setup.py test --coverage --testr-args='{posargs}' - -[testenv:cover-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = python setup.py test --coverage --testr-args='{posargs}' - [testenv:docs] commands = python setup.py build_sphinx - -[testenv:docs-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = python setup.py build_sphinx - -[testenv:debug] -commands = oslo_debug_helper {posargs} - -[testenv:debug-constraints] -install_command = {[testenv:common-constraints]install_command} -commands = oslo_debug_helper {posargs} - -[flake8] -# E123, E125 skipped as they are invalid PEP-8. - -show-source = True -ignore = E123,E125 -builtins = _ -exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build