summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorEli Collins <elic@assurancetechnologies.com>2013-12-20 23:42:21 -0500
committerEli Collins <elic@assurancetechnologies.com>2013-12-20 23:42:21 -0500
commitd48644569397bfe529bc05a68ecd21d031550fa6 (patch)
treeca79158f8a025139592d6df14cf293210210dab8 /tox.ini
parent4af9748bcaed1085a8c1e64c2370fa00fb244f11 (diff)
downloadpasslib-d48644569397bfe529bc05a68ecd21d031550fa6.tar.gz
added support for bcrypt library (issue 49),
also split bcrypt handler tests out into separate file for ease of testing
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini35
1 files changed, 28 insertions, 7 deletions
diff --git a/tox.ini b/tox.ini
index c89f5ac..10e254e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,8 +27,9 @@
# djangoXX - tests specific django versions
#
# testing of bcrypt backends - split across various cpython tests:
-# py25 - tests builtin bcrypt
-# py27 - tests py-bcrypt, bcryptor
+# py27 - tests bcrypt & bcryptor (so they can be cross-checked)
+# py33 - tests bcrypt
+# py-bcrypt - tests py-bcrypt & bcryptor (so they can be cross-checked)
#===========================================================================
#===========================================================================
@@ -36,7 +37,7 @@
#===========================================================================
[tox]
minversion=1.4
-envlist = py27,py33,py25,py26,py31,py32,pypy,pypy3,django12,django13,django14,django15,jython,gae25,gae27
+envlist = py27,py33,py25,py26,py31,py32,pypy,pypy3,py-bcrypt,py-bcrypt-py3,django12,django13,django14,django15,jython,gae25,gae27
#===========================================================================
# stock CPython VMs
@@ -61,11 +62,12 @@ deps =
[testenv:py27]
# NOTE: M2Crypto requires swig & libssl-dev,
# a number of packages required C compiler & python-dev
+# NOTE: bcryptor requires Cython
deps =
nose
coverage
unittest2
- py-bcrypt
+ bcrypt
bcryptor
django
M2Crypto
@@ -78,19 +80,38 @@ deps =
[testenv:py32]
deps =
nose
- coverage
unittest2py3k
[testenv:py33]
-# TODO: test bcrypt library w/ py3 compatibility
deps =
nose
coverage
unittest2py3k
django
+ bcrypt
+
+#===========================================================================
+# bcrypt library-specific testing
+#===========================================================================
+[testenv:py-bcrypt]
+deps =
+ bcryptor
+ py-bcrypt
+ {[testenv]deps}
+commands =
+ nosetests {posargs:passlib.tests.test_handlers_bcrypt}
+
+[testenv:py-bcrypt-py3]
+basepython = python3
+deps =
+# bcryptor -- has py3 installation issues
+ py-bcrypt
+ {[testenv:py32]deps}
+commands =
+ nosetests {posargs:passlib.tests.test_handlers_bcrypt}
#===========================================================================
-# django integration testing
+# django version-specific testing
#===========================================================================
[testenv:django12]
deps =