Fix test env for the stable branch
Need both changes in one commit to pass the gate! * Nail pep8 dependencies to 1.0.1. Nails the pep8 deps for tox and test-requires to 1.0.1. Fixes an issues causing pep8 failures due to a new pep8 release. (cherry picked from Nova stable) * Switch to 1000 rounds during unit tests Fixes bug 992918 passlib 1.6 introduced a minimum number of rounds for sha512_crypt. As a result, increase the rounds used during testing to the minimum Change-Id: Ic0c635e92b4f13180a047904a6efa490ab599012
This commit is contained in:
parent
aff45d69a7
commit
7715d6cd72
|
@ -1,5 +1,5 @@
|
||||||
[DEFAULT]
|
[DEFAULT]
|
||||||
crypt_strength = 10
|
crypt_strength = 1000
|
||||||
|
|
||||||
[identity]
|
[identity]
|
||||||
driver = keystone.identity.backends.kvs.Identity
|
driver = keystone.identity.backends.kvs.Identity
|
||||||
|
|
|
@ -11,7 +11,7 @@ nose # for test discovery and console feedback
|
||||||
nosexcover
|
nosexcover
|
||||||
openstack.nose_plugin
|
openstack.nose_plugin
|
||||||
pylint # static code analysis
|
pylint # static code analysis
|
||||||
pep8==0.6.1 # checks for PEP8 code style compliance
|
pep8==1.0.1 # checks for PEP8 code style compliance
|
||||||
Sphinx>=1.1.2 # required to build documentation
|
Sphinx>=1.1.2 # required to build documentation
|
||||||
unittest2 # backport of unittest lib in python 2.7
|
unittest2 # backport of unittest lib in python 2.7
|
||||||
webtest # test wsgi apps without starting an http server
|
webtest # test wsgi apps without starting an http server
|
||||||
|
|
2
tox.ini
2
tox.ini
|
@ -8,7 +8,7 @@ deps = -r{toxinidir}/tools/pip-requires
|
||||||
commands = bash run_tests.sh -N --no-pep8
|
commands = bash run_tests.sh -N --no-pep8
|
||||||
|
|
||||||
[testenv:pep8]
|
[testenv:pep8]
|
||||||
deps = pep8
|
deps = pep8==1.0.1
|
||||||
commands = pep8 --exclude=vcsversion.py,*.pyc --repeat --show-source bin keystone setup.py
|
commands = pep8 --exclude=vcsversion.py,*.pyc --repeat --show-source bin keystone setup.py
|
||||||
|
|
||||||
[testenv:hudson]
|
[testenv:hudson]
|
||||||
|
|
Loading…
Reference in New Issue