summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2015-01-25 12:42:23 -0500
committerEli Collins <elic@assurancetechnologies.com>2015-01-25 12:42:23 -0500
commit85ed9fdbad6de406fc117ff900e4f274840ab19e (patch)
tree6bd956c7f46b9f9daaae156a6a6ae78c827683e6 /tox.ini
parent68c2fb171666b3106df8ba457cd96c40af4197a1 (diff)
downloadpasslib-85ed9fdbad6de406fc117ff900e4f274840ab19e.tar.gz
bugfix: passlib.ext.django: clarified & tweaked logic for when we pass
make_password()'s salt parameter on to the hash (fixes issue 52). old behavior would incorrectly pass explicit salt provided for hash that didn't need one; a situation that only occurs in django 1.4.0-1.4.5's unittests, and was corrected in django 1.4.6's. new behavior separates out a couple of the cases we were trying to handle, handles them separately, has better comment explaining what's going on.
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini10
1 files changed, 10 insertions, 0 deletions
diff --git a/tox.ini b/tox.ini
index e52df3b..6b47cc9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -133,6 +133,16 @@ deps =
commands =
nosetests {posargs:passlib.tests.test_ext_django passlib.tests.test_handlers_django}
+[testenv:django145]
+# NOTE: doing this to detect regression of issue 52, since django < 1.4.6
+# has some slight differences in the hasher classes & tests.
+deps =
+ django==1.4.5
+ bcrypt
+ {[testenv]deps}
+commands =
+ nosetests {posargs:passlib.tests.test_ext_django passlib.tests.test_handlers_django}
+
[testenv:django14]
deps =
django<1.5