From 5b16b84c42f2c1a1feb00901b76d820dd77b4be0 Mon Sep 17 00:00:00 2001
From: Jakub Stasiak <jakub@stasiak.at>
Date: Tue, 2 Apr 2013 01:37:55 +0100
Subject: [PATCH] tests: Improve tox configuration and setup Travis

---
 .travis.yml           | 11 +++++++++++
 tests/greenio_test.py |  1 +
 tox.ini               | 41 +++++++++++++++++++++++++++++++++++------
 3 files changed, 47 insertions(+), 6 deletions(-)
 create mode 100644 .travis.yml

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..82de7d3
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,11 @@
+language: python
+python: 2.7
+install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -qq libssl-dev libmysqlclient-dev libpq-dev
+  - pip install tox
+before_script:
+  - "export EVENTLET_DB_TEST_AUTH='{\"psycopg2\": {\"user\": \"postgres\"}, \"MySQLdb\": {\"passwd\": \"\", \"host\": \"localhost\", \"user\": \"root\"}}'"
+script:
+  - tox -e py25selects,py25poll; true
+  - tox -e py26selects,py26poll,py26epolls,py27selects,py27poll,py27epolls
diff --git a/tests/greenio_test.py b/tests/greenio_test.py
index 4b70945..597651d 100644
--- a/tests/greenio_test.py
+++ b/tests/greenio_test.py
@@ -182,6 +182,7 @@ class TestGreenSocket(LimitedTestCase):
         gt.wait()
 
     def test_send_timeout(self):
+        self.reset_timeout(2)
         listener = bufsized(eventlet.listen(('', 0)))
 
         evt = event.Event()
diff --git a/tox.ini b/tox.ini
index 1b3f7b7..1ce8e7d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,42 +1,71 @@
 [tox]
-envlist = py25,py26,py27
+envlist = py25selects,py25poll,py26selects,py26poll,py26epolls,py27selects,py27poll,py27epolls
 
 [testenv]
-deps = nose
+downloadcache = {toxworkdir}/pip_download_cache
+deps =
+    nose==1.2.1
+    pyopenssl==0.13
+    MySQL-python==1.2.4
+    psycopg2==2.4.6
 commands =
-         nosetests tests/
-         nosetests --with-doctest eventlet/coros.py eventlet/event.py \
-             eventlet/pool.py eventlet/pools.py eventlet/proc.py \
-             eventlet/queue.py eventlet/timeout.py
+    nosetests --verbose tests/
+    nosetests --verbose --with-doctest eventlet/coros.py eventlet/event.py \
+        eventlet/pool.py eventlet/pools.py eventlet/proc.py \
+        eventlet/queue.py eventlet/timeout.py
 
 [testenv:py25selects]
 basepython = python2.5
 setenv = EVENTLET_HUB = selects
+deps =
+    {[testenv]deps}
+    pyzmq<2.2
 
 [testenv:py25poll]
 basepython = python2.5
 setenv = EVENTLET_HUB = poll
+deps =
+    {[testenv]deps}
+    pyzmq<2.2
 
 [testenv:py26selects]
 basepython = python2.6
 setenv = EVENTLET_HUB = selects
+deps =
+    {[testenv]deps}
+    pyzmq==2.2.0.1
 
 [testenv:py26poll]
 basepython = python2.6
 setenv = EVENTLET_HUB = poll
+deps =
+    {[testenv]deps}
+    pyzmq==2.2.0.1
 
 [testenv:py26epolls]
 basepython = python2.6
 setenv = EVENTLET_HUB = epolls
+deps =
+    {[testenv]deps}
+    pyzmq==2.2.0.1
 
 [testenv:py27selects]
 basepython = python2.7
 setenv = EVENTLET_HUB = selects
+deps =
+    {[testenv]deps}
+    pyzmq==2.2.0.1
 
 [testenv:py27poll]
 basepython = python2.7
 setenv = EVENTLET_HUB = poll
+deps =
+    {[testenv]deps}
+    pyzmq==2.2.0.1
 
 [testenv:py27epolls]
 basepython = python2.7
 setenv = EVENTLET_HUB = epolls
+deps =
+    {[testenv]deps}
+    pyzmq==2.2.0.1