From: Ben Darnell <ben@bendarnell.com>
Date: Thu, 6 Sep 2012 00:54:21 +0000 (-0700)
Subject: Add unittest2 to other test configurations.
X-Git-Tag: v3.0.0~272^2~27^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b7ebadd1b17372382c540596352ddb00a7ed062;p=thirdparty%2Ftornado.git

Add unittest2 to other test configurations.
---

diff --git a/.travis.yml b/.travis.yml
index 88837e45e..47916bdb5 100644
--- 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 2ae1b27af..eeca8b41c 100644
--- 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 e30ef22a6..9e8a663db 100644
--- 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