Permalink
Browse files

Add unittest2 to other test configurations.

  • Loading branch information...
bdarnell committed Sep 6, 2012
1 parent e1a0aea commit 5b7ebadd1b17372382c540596352ddb00a7ed062
Showing with 19 additions and 4 deletions.
  1. +2 −1 .travis.yml
  2. +8 −1 maint/vm/ubuntu10.04/tox.ini
  3. +9 −2 maint/vm/ubuntu12.04/tox.ini
View
@@ -19,7 +19,8 @@ matrix:
- python: 3.2
env: LANG="C"
install:
- - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors simplejson; fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors simplejson unittest2; fi
+ - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors unittest2; fi
- if [[ $FULL == 'true' ]]; then sudo apt-get install librtmp-dev; pip install --use-mirrors MySQL-python pycurl; fi
- if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.5' ]]; then pip install --use-mirrors twisted==11.0.0 'zope.interface<4.0'; fi
- if [[ $FULL == 'true' && $TRAVIS_PYTHON_VERSION == '2.6' ]]; then pip install --use-mirrors twisted==11.0.0; fi
@@ -8,7 +8,9 @@ commands = python -m tornado.test.runtests {posargs:}
[testenv:py25]
basepython = python2.5
-deps = simplejson
+deps =
+ simplejson
+ unittest2
[testenv:py25-full]
basepython = python2.5
@@ -17,13 +19,18 @@ deps =
pycurl
simplejson
twisted==11.0.0
+ unittest2
zope.interface<4.0
+[testenv:py26]
+deps = unittest2
+
[testenv:py26-full]
deps =
MySQL-python
pycurl
twisted==11.0.0
+ unittest2
[testenv:py27-full]
basepython = python2.7
@@ -8,7 +8,9 @@ commands = python -m tornado.test.runtests {posargs:}
[testenv:py25]
basepython = python2.5
-deps = simplejson
+deps =
+ simplejson
+ unittest2
[testenv:py25-full]
basepython = python2.5
@@ -17,11 +19,16 @@ deps =
pycurl
simplejson
twisted==11.0.0
+ unittest2
zope.interface<4.0
+[testenv:py26]
+basepython = python2.6
+deps = unittest2
+
[testenv:py27-full]
basepython = python2.7
deps =
MySQL-python
pycurl
- twisted==11.0.0
+ twisted==11.0.0

0 comments on commit 5b7ebad

Please sign in to comment.