Add unittest2 to other test configurations.

diff --git a/.travis.yml b/.travis.yml
index 88837e45e352dd303285835ac989e5b11a7e5eeb..47916bdb5fea7ef3e4fa316638f19a3327b63a5e 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -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

diff --git a/maint/vm/ubuntu10.04/tox.ini b/maint/vm/ubuntu10.04/tox.ini
index 2ae1b27af7ab2a5eb0c73bf00c571e8e0d28cab5..eeca8b41cd9d43a58ced695f34760895b99c5125 100644 (file)
--- a/maint/vm/ubuntu10.04/tox.ini
+++ b/maint/vm/ubuntu10.04/tox.ini
@@ -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

diff --git a/maint/vm/ubuntu12.04/tox.ini b/maint/vm/ubuntu12.04/tox.ini
index e30ef22a611a2d275fddc0123d0e036be27deaef..9e8a663db89250aaa3d181649fc9541f17244885 100644 (file)
--- a/maint/vm/ubuntu12.04/tox.ini
+++ b/maint/vm/ubuntu12.04/tox.ini
@@ -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
\ No newline at end of file