From 92fd2dbfb672d7b2b1cdfd5dd5cf89f7716b3e12 Mon Sep 17 00:00:00 2001 From: asteroide Date: Tue, 1 Sep 2015 16:03:26 +0200 Subject: Update Keystone code from official Github repository with branch Master on 09/01/2015. Change-Id: I0ff6099e6e2580f87f502002a998bbfe12673498 --- keystone-moon/tox.ini | 108 +++++++++++++++++++++++++------------------------- 1 file changed, 54 insertions(+), 54 deletions(-) (limited to 'keystone-moon/tox.ini') diff --git a/keystone-moon/tox.ini b/keystone-moon/tox.ini index 366a6829..cea70b7b 100644 --- a/keystone-moon/tox.ini +++ b/keystone-moon/tox.ini @@ -1,77 +1,64 @@ [tox] minversion = 1.6 skipsdist = True -envlist = py27,py33,py34,pep8,docs,sample_config +envlist = py27,py34,pep8,docs,genconfig [testenv] usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt + .[ldap,memcache,mongodb] commands = bash tools/pretty_tox.sh '{posargs}' whitelist_externals = bash - -[testenv:py33] -deps = -r{toxinidir}/requirements-py3.txt - -r{toxinidir}/test-requirements-py3.txt - nose -commands = - nosetests --with-coverage --cover-package=keystone \ - --exclude test_ldap \ - keystone/tests/test_auth_plugin.py \ - keystone/tests/test_backend.py \ - keystone/tests/test_backend_rules.py \ - keystone/tests/test_cache_backend_mongo.py \ - keystone/tests/test_driver_hints.py \ - keystone/tests/test_hacking_checks.py \ - keystone/tests/test_injection.py \ - keystone/tests/test_matchers.py \ - keystone/tests/test_policy.py \ - keystone/tests/test_singular_plural.py \ - keystone/tests/test_sizelimit.py \ - keystone/tests/test_sql_migrate_extensions.py \ - keystone/tests/test_token_bind.py \ - keystone/tests/test_url_middleware.py \ - keystone/tests/unit/common/test_utils.py \ - keystone/tests/test_validation.py \ - keystone/tests/test_v3_controller.py \ - keystone/tests/test_wsgi.py \ - keystone/tests/unit +passenv = http_proxy HTTP_PROXY https_proxy HTTPS_PROXY no_proxy NO_PROXY [testenv:py34] -deps = -r{toxinidir}/requirements-py3.txt - -r{toxinidir}/test-requirements-py3.txt +deps = -r{toxinidir}/test-requirements.txt nose + .[memcache,mongodb] commands = nosetests --with-coverage --cover-package=keystone \ - --exclude test_ldap \ - keystone/tests/test_auth_plugin.py \ - keystone/tests/test_backend.py \ - keystone/tests/test_backend_rules.py \ - keystone/tests/test_cache_backend_mongo.py \ - keystone/tests/test_driver_hints.py \ - keystone/tests/test_hacking_checks.py \ - keystone/tests/test_injection.py \ - keystone/tests/test_matchers.py \ - keystone/tests/test_policy.py \ - keystone/tests/test_singular_plural.py \ - keystone/tests/test_sizelimit.py \ - keystone/tests/test_sql_migrate_extensions.py \ - keystone/tests/test_token_bind.py \ - keystone/tests/test_url_middleware.py \ + keystone/tests/unit/auth/test_controllers.py \ + keystone/tests/unit/catalog/test_core.py \ + keystone/tests/unit/common/test_base64utils.py \ + keystone/tests/unit/common/test_injection.py \ + keystone/tests/unit/common/test_json_home.py \ + keystone/tests/unit/common/test_sql_core.py \ keystone/tests/unit/common/test_utils.py \ - keystone/tests/test_validation.py \ - keystone/tests/test_v3_controller.py \ - keystone/tests/test_wsgi.py \ - keystone/tests/unit + keystone/tests/unit/test_auth_plugin.py \ + keystone/tests/unit/test_backend.py \ + keystone/tests/unit/test_backend_endpoint_policy.py \ + keystone/tests/unit/test_backend_rules.py \ + keystone/tests/unit/test_cache_backend_mongo.py \ + keystone/tests/unit/test_config.py \ + keystone/tests/unit/test_contrib_s3_core.py \ + keystone/tests/unit/test_driver_hints.py \ + keystone/tests/unit/test_exception.py \ + keystone/tests/unit/test_policy.py \ + keystone/tests/unit/test_singular_plural.py \ + keystone/tests/unit/test_sql_livetest.py \ + keystone/tests/unit/test_sql_migrate_extensions.py \ + keystone/tests/unit/test_sql_upgrade.py \ + keystone/tests/unit/test_ssl.py \ + keystone/tests/unit/test_token_bind.py \ + keystone/tests/unit/test_url_middleware.py \ + keystone/tests/unit/test_v3_controller.py \ + keystone/tests/unit/test_validation.py \ + keystone/tests/unit/test_wsgi.py \ + keystone/tests/unit/tests/test_core.py \ + keystone/tests/unit/tests/test_utils.py \ + keystone/tests/unit/token/test_pki_provider.py \ + keystone/tests/unit/token/test_pkiz_provider.py \ + keystone/tests/unit/token/test_token_model.py \ + keystone/tests/unit/token/test_uuid_provider.py [testenv:pep8] commands = flake8 {posargs} # Run bash8 during pep8 runs to ensure violations are caught by # the check and gate queues - bashate run_tests.sh examples/pki/gen_pki.sh + bashate examples/pki/gen_pki.sh # Check that .po and .pot files are valid. bash -c "find keystone -type f -regex '.*\.pot?' -print0| \ xargs -0 -n 1 msgfmt --check-format -o /dev/null" @@ -88,6 +75,12 @@ commands = {posargs} [testenv:debug] commands = oslo_debug_helper {posargs} +[testenv:functional] +basepython = python3.4 +deps = -r{toxinidir}/test-requirements.txt +setenv = OS_TEST_PATH=./keystone/tests/functional +commands = python setup.py testr --slowest --testr-args='{posargs}' + [flake8] filename= *.py,keystone-all,keystone-manage show-source = true @@ -100,12 +93,19 @@ max-complexity=24 [testenv:docs] commands= + bash -c "rm -rf doc/build" + bash -c "rm -rf doc/source/api" python setup.py build_sphinx -[testenv:sample_config] +[testenv:genconfig] commands = oslo-config-generator --config-file=config-generator/keystone.conf +[testenv:bandit] +deps = .[bandit] +commands = bandit -c bandit.yaml -r keystone -n5 -p keystone_conservative + [hacking] import_exceptions = keystone.i18n -local-check-factory = keystone.hacking.checks.factory + six.moves +local-check-factory = keystone.tests.hacking.checks.factory -- cgit 1.2.3-korg