Skip to content

Commit

Permalink
Fix test env for the stable branch
Browse files Browse the repository at this point in the history
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
  • Loading branch information
apevec committed Jun 11, 2012
1 parent aff45d6 commit 7715d6c
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion tests/test_overrides.conf
@@ -1,5 +1,5 @@
[DEFAULT]
crypt_strength = 10
crypt_strength = 1000

[identity]
driver = keystone.identity.backends.kvs.Identity
Expand Down
2 changes: 1 addition & 1 deletion tools/test-requires
Expand Up @@ -11,7 +11,7 @@ nose # for test discovery and console feedback
nosexcover
openstack.nose_plugin
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
unittest2 # backport of unittest lib in python 2.7
webtest # test wsgi apps without starting an http server
Expand Down
2 changes: 1 addition & 1 deletion tox.ini
Expand Up @@ -8,7 +8,7 @@ deps = -r{toxinidir}/tools/pip-requires
commands = bash run_tests.sh -N --no-pep8

[testenv:pep8]
deps = pep8
deps = pep8==1.0.1
commands = pep8 --exclude=vcsversion.py,*.pyc --repeat --show-source bin keystone setup.py

[testenv:hudson]
Expand Down

0 comments on commit 7715d6c

Please sign in to comment.