updated tox config for pytestpytest

1 files changed, 30 insertions, 9 deletions

diff --git a/tox.ini b/tox.ini
index e3602fd..2f1b1c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,23 +2,44 @@
 envlist = py25, py26, py27, py32, py33, hi26, hi27, hi32, hi33, pep8
 
 [testenv]
-commands = python setup.py test
+deps=pytest
+commands = py.test []
+downloadcache = {toxworkdir}/cache
+
+[testenv:py25]
+downloadcache = {toxworkdir}/cache
+setenv =
+    PIP_INSECURE=1
+deps =
+    pytest
 
 [testenv:hi26]
-deps = hiredis
-commands = python setup.py test
+downloadcache = {toxworkdir}/cache
+deps =
+    hiredis
+    pytest
+commands = py.test []
 
 [testenv:hi27]
-deps = hiredis
-commands = python setup.py test
+downloadcache = {toxworkdir}/cache
+deps =
+    hiredis
+    pytest
+commands = py.test []
 
 [testenv:hi32]
-deps = hiredis
-commands = python setup.py test
+downloadcache = {toxworkdir}/cache
+deps =
+    hiredis
+    pytest
+commands = py.test []
 
 [testenv:hi33]
-deps = hiredis
-commands = python setup.py test
+downloadcache = {toxworkdir}/cache
+deps =
+    hiredis
+    pytest
+commands = py.test []
 
 [testenv:pep8]
 deps = pep8