Changes to testing stuff

* simplified tox config
* added python 3 to travis config

1 files changed, 9 insertions, 23 deletions

diff --git a/tox.ini b/tox.ini
index e29a2cd..7deab28 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,30 +1,16 @@
-# TODO(ib-lundgren): Fix this, it's ugly...
 [tox]
 envlist = py26,py27,py31,py32,py33
-[testenv:py26]
+
+[testenv]
 deps=nose
-     unittest2
      pycrypto
      mock
 commands=nosetests -w tests
+
+[testenv:py26]
+deps=unittest2
+     {[testenv]deps}
+
 [testenv:py27]
-deps=nose
-     unittest2
-     pycrypto
-     mock
-commands=nosetests -w tests
-[testenv:py31]
-deps=nose
-     pycrypto
-     mock
-commands=nosetests -w tests
-[testenv:py32]
-deps=nose
-     pycrypto
-     mock
-commands=nosetests -w tests
-[testenv:py33]
-deps=nose
-     pycrypto
-     mock
-commands=nosetests -w tests
+deps=unittest2
+     {[testenv]deps}