From dd195a31f224855f0ab3c792fae74ddfeedc9384 Mon Sep 17 00:00:00 2001
From: David Szotten <davidszotten@gmail.com>
Date: Sat, 20 Dec 2014 13:51:18 +0000
Subject: [PATCH] Tests: tidy up tox file

using new multi-dimensional support in 1.8

also update travis file

Closes GH #180
---
 .travis.yml |  48 ++++++++---------
 tox.ini     | 150 +++++++++-------------------------------------------
 2 files changed, 48 insertions(+), 150 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7fe85f1..f106ff2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,33 +2,33 @@ language: python
 python: 2.7
 env:
   - TOX_ENV=pep8
-  - TOX_ENV=py26selects
-  - TOX_ENV=py26poll
-  - TOX_ENV=py26epolls
-  - TOX_ENV=py27selects
-  - TOX_ENV=py27poll
-  - TOX_ENV=py27epolls
-  - TOX_ENV=py33selects
-  - TOX_ENV=py33poll
-  - TOX_ENV=py33epolls
-  - TOX_ENV=py34selects
-  - TOX_ENV=py34poll
-  - TOX_ENV=py34epolls
-  - TOX_ENV=pypyselects
-  - TOX_ENV=pypypoll
-  - TOX_ENV=pypyepolls
+  - TOX_ENV=py26-selects
+  - TOX_ENV=py26-poll
+  - TOX_ENV=py26-epolls
+  - TOX_ENV=py27-selects
+  - TOX_ENV=py27-poll
+  - TOX_ENV=py27-epolls
+  - TOX_ENV=py33-selects
+  - TOX_ENV=py33-poll
+  - TOX_ENV=py33-epolls
+  - TOX_ENV=py34-selects
+  - TOX_ENV=py34-poll
+  - TOX_ENV=py34-epolls
+  - TOX_ENV=pypy-selects
+  - TOX_ENV=pypy-poll
+  - TOX_ENV=pypy-epolls
 matrix:
   fast_finish: true
   allow_failures:
-    - env: TOX_ENV=py33selects
-    - env: TOX_ENV=py33poll
-    - env: TOX_ENV=py33epolls
-    - env: TOX_ENV=py34selects
-    - env: TOX_ENV=py34poll
-    - env: TOX_ENV=py34epolls
-    - env: TOX_ENV=pypyselects
-    - env: TOX_ENV=pypypoll
-    - env: TOX_ENV=pypyepolls
+    - env: TOX_ENV=py33-selects
+    - env: TOX_ENV=py33-poll
+    - env: TOX_ENV=py33-epolls
+    - env: TOX_ENV=py34-selects
+    - env: TOX_ENV=py34-poll
+    - env: TOX_ENV=py34-epolls
+    - env: TOX_ENV=pypy-selects
+    - env: TOX_ENV=pypy-poll
+    - env: TOX_ENV=pypy-epolls
 install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq libssl-dev libmysqlclient-dev libpq-dev libzmq3-dev
diff --git a/tox.ini b/tox.ini
index 840582b..48c980e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,27 +15,7 @@ statistics = 1
 
 [tox]
 envlist =
-    pep8,
-    py26selects,py26poll,py26epolls,
-    py27selects,py27poll,py27epolls,
-    py33selects,py33poll,py33epolls,
-    py34selects,py34poll,py34epolls,
-    pypyselects,pypypoll,pypyepolls,
-
-[testenv]
-downloadcache = {toxworkdir}/pip_download_cache
-setenv =
-    PYTHONDONTWRITEBYTECODE = 1
-deps =
-    nose==1.3.1
-    psycopg2cffi-compat==1.1
-    pyopenssl==0.13
-    pyzmq==13.1.0
-    setuptools==5.4.1
-commands =
-    nosetests --verbose tests/
-    nosetests --verbose --with-doctest eventlet/coros.py eventlet/event.py \
-        eventlet/pools.py eventlet/queue.py eventlet/timeout.py
+    pep8, {py26,py27,py33,py34,pypy}-{selects,poll,epolls}
 
 [testenv:pep8]
 basepython = python2.7
@@ -46,110 +26,28 @@ deps =
 commands =
     pep8 benchmarks/ eventlet/ tests/
 
-[testenv:py26selects]
-basepython = python2.6
+[testenv]
+downloadcache = {toxworkdir}/pip_download_cache
 setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
+    PYTHONDONTWRITEBYTECODE = 1
+    selects: EVENTLET_HUB = selects
+    poll: EVENTLET_HUB = poll
+    epolls: EVENTLET_HUB = epolls
+basepython =
+    py26: python2.6
+    py27: python2.7
+    py33: python3.3
+    py34: python3.4
+    pypy: pypy
 deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py26poll]
-basepython = python2.6
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py26epolls]
-basepython = python2.6
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py27selects]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py27poll]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py27epolls]
-basepython = python2.7
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-deps =
-    {[testenv]deps}
-    MySQL-python==1.2.5
-
-[testenv:py33selects]
-basepython = python3.3
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-
-[testenv:py33poll]
-basepython = python3.3
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-
-[testenv:py33epolls]
-basepython = python3.3
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-
-[testenv:py34selects]
-basepython = python3.4
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-
-[testenv:py34poll]
-basepython = python3.4
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-
-[testenv:py34epolls]
-basepython = python3.4
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
-
-[testenv:pypyselects]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = selects
-
-[testenv:pypypoll]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = poll
-
-[testenv:pypyepolls]
-basepython = pypy
-setenv =
-    {[testenv]setenv}
-    EVENTLET_HUB = epolls
+    nose==1.3.1
+    psycopg2cffi-compat==1.1
+    pyopenssl==0.13
+    pyzmq==13.1.0
+    setuptools==5.4.1
+    py26: MySQL-python==1.2.5
+    py27: MySQL-python==1.2.5
+commands =
+    nosetests --verbose tests/
+    nosetests --verbose --with-doctest eventlet/coros.py eventlet/event.py \
+        eventlet/pools.py eventlet/queue.py eventlet/timeout.py