some test fixes and configure tox-testing against pytest==2.3.5 and pytest>=2.4.2

2013-10-04 10:34:24 +02:00
parent a9aca9a3ae
commit b88b23e358
8 changed files with 46 additions and 28 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -1,16 +1,26 @@
 [tox]
-envlist=py26,py32,py33,py27,py25
+envlist=py26,py32,py33,py27,py26,py26-old,py33-old

 [testenv]
 changedir=testing
-deps=pytest>=2.3.5
+deps=pytest>=2.4.2
 commands= py.test --junitxml={envlogdir}/junit-{envname}.xml []

 [testenv:py27]
 deps=
-    pytest
+    pytest>=2.4.2
    pexpect

+[testenv:py26-old]
+deps=
+    pytest==2.3.5
+    pexpect
+
+[testenv:py33-old]
+basepython = python3.3
+deps=
+    pytest==2.3.5
+
 [pytest]
 addopts = -rsfxX
 ;; hello