diff --git a/tox.ini b/tox.ini index f84317341..2bb934c30 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ [tox] toxworkdir = {env:TMPDIR:/tmp}/tox-{env:USER}/authentic/{env:BRANCH_NAME:} -envlist = py27-coverage-{dj18,dj111}-{authentic,rbac}-{pg,sqlite} +envlist = py27-coverage-{dj18,dj111}-authentic-{pg,sqlite}-{oldldap,},py27-coverage-{dj18,dj111}-rbac-{pg,sqlite} [testenv] # django.contrib.auth is not tested it does not work with our templates @@ -21,6 +21,8 @@ setenv = rbac: DJANGO_SETTINGS_MODULE=django_rbac.test_settings fast: FAST=--nomigrations reusedb: REUSEDB=--reuse-db + A2_TESTS=tests + oldldap: A2_TESTS=tests/test_ldap.py usedevelop = coverage: True nocoverage: False @@ -50,9 +52,10 @@ deps = pytz pytest-freezegun ldaptools>=0.15 + oldldap: python-ldap<3 commands = ./getlasso.sh - authentic: py.test {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {posargs:tests/ --random} + authentic: py.test {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {posargs:{env:A2_TESTS:tests/} --random} rbac: py.test {env:FAST:} {env:REUSEDB:} {env:COVERAGE:} {posargs:tests_rbac/} coverage: mv coverage.xml coverage-{envname}.xml coverage-dj18-authentic-pg: mv htmlcov htmlcov-coverage-dj18-authentic-pg