tox.ini: run with Django 1.7, 1.8 and 1.9, install lasso

getlasso.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Get venv site-packages path
+DSTDIR=`python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
+
+# Get not venv site-packages path
+# Remove first path (assuming that is the venv path)
+NONPATH=`echo $PATH | sed 's/^[^:]*://'`
+SRCDIR=`PATH=$NONPATH python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())'`
+
+# Clean up
+rm -f $DSTDIR/lasso.*
+rm -f $DSTDIR/_lasso.*
+
+# Link
+ln -sv $SRCDIR/lasso.py $DSTDIR
+ln -sv $SRCDIR/_lasso.* $DSTDIR
+
+exit 0
+

tests/settings.py

@@ -0,0 +1,11 @@
+import os
+
+LANGUAGE_CODE = 'en'
+DATABASES = {
+    'default': {
+        'ENGINE': os.environ['DB_ENGINE'],
+        'TEST': {
+            'NAME': 'a2-test',
+        },
+    }
+}

tox.ini

@@ -3,14 +3,28 @@
 # test suite on all supported python versions. To use it, "pip install tox"
 # and then run "tox" from this directory.
 
+
 [tox]
-envlist = coverage, nocoverage, package
+envlist = {coverage,nocoverage}-{dj17,dj18,dj19}-{pg,sqlite},package
 
-[testenv:coverage]
+[testenv]
+whitelist_externals =
+    /bin/mv
 setenv =
+    AUTHENTIC2_SETTINGS_FILES=tests/settings.py
     DJANGO_SETTINGS_MODULE=authentic2.settings
-usedevelop = true
-deps = pytest
+    sqlite: DB_ENGINE=sqlite3
+    pg: DB_ENGINE=postgresql_psycopg2
+    coverage: COVERAGE=--junit-xml=junit.xml --cov=src --cov-report xml
+usedevelop =
+    coverage: true
+    nocoverage: false
+deps =
+    dj17: django>1.7,<1.8
+    dj18: django>1.8,<1.9
+    dj19: django>1.9,<1.10
+    pg: psycopg2
+    pytest
     pytest-cov
     pytest-random
     pytest-django
@@ -19,25 +33,14 @@ deps = pytest
     http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.bz2
     django-kerberos
 commands =
-    py.test {posargs:--junit-xml=junit.xml --cov=src --cov-report xml --nomigrations tests}
-
-[testenv:nocoverage]
-setenv =
-    DJANGO_SETTINGS_MODULE=authentic2.settings
-deps = pytest
-    pytest-cov
-    pytest-random
-    pytest-django
-    pytest-capturelog
-    ldaptools
-    http://git.entrouvert.org/authentic.git/snapshot/authentic-master.tar.bz2
-    django-kerberos
-commands =
-    py.test {posargs:--nomigrations tests}
+    ./getlasso.sh
+    py.test {env:COVERAGE:} {posargs:tests}
+    coverage: mv coverage.xml coverage-{envname}.xml
 
 [testenv:package]
 # eobuilder is not on pypi, too bad
-whitelist_externals = /bin/sh
+whitelist_externals =
+  /bin/sh
 deps = setuptools
   pip<8
   pyasn1