summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2013-10-10 12:08:04 +0000
committerGerrit Code Review <review@openstack.org>2013-10-10 12:08:04 +0000
commitd2ed78e07de7cd1f0417471191c3f904492b8998 (patch)
tree427374f73eb644618e3bcdaf4dc4a50b6f797205
parent11932532a29d13d8a5d275970aa22425052da579 (diff)
parent9c5e99e12a3825382bb1196a654dcd5063847318 (diff)
downloadtuskar-ui-d2ed78e07de7cd1f0417471191c3f904492b8998.tar.gz
Merge "Put back the tests for Django 1.4"
-rw-r--r--tox.ini7
1 files changed, 6 insertions, 1 deletions
diff --git a/tox.ini b/tox.ini
index 051e43a0..56ad8b0c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
[tox]
-envlist = py26,py27,pep8
+envlist = py26,py27,py27dj14,pep8
[testenv]
setenv = VIRTUAL_ENV={envdir}
@@ -21,6 +21,11 @@ commands = {posargs}
[testenv:cover]
commands = /bin/bash run_tests.sh -N --coverage
+[testenv:py27dj14]
+basepython = python2.7
+commands = pip install django==1.4
+ /bin/bash run_tests.sh -N
+
[tox:jenkins]
downloadcache = ~/cache/pip