summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2014-12-12 18:06:05 +0100
committerVictor Stinner <victor.stinner@gmail.com>2014-12-12 18:06:05 +0100
commit8bcf37ec0670be64395c8ce66b17cfa585626363 (patch)
tree9465ec3cadd65e0f7676c664605b505d9850cfd6
parent164460490fcfdbeaca06e77335217d1cb8d61f1c (diff)
downloadtrollius-8bcf37ec0670be64395c8ce66b17cfa585626363.tar.gz
tox now also run the aiotest test suite
-rw-r--r--doc/changelog.rst2
-rw-r--r--run_aiotest.py1
-rw-r--r--tox.ini26
3 files changed, 19 insertions, 10 deletions
diff --git a/doc/changelog.rst b/doc/changelog.rst
index 5c09e17..6bb2780 100644
--- a/doc/changelog.rst
+++ b/doc/changelog.rst
@@ -12,6 +12,8 @@ Changes:
loop is closed. Initial patch written by Torsten Landschoff.
* Python issue #22921: Don't require OpenSSL SNI to pass hostname to ssl
functions. Patch by Donald Stufft.
+* Add run_aiotest.py
+* tox now also run the aiotest test suite
Bugfixes:
diff --git a/run_aiotest.py b/run_aiotest.py
index d5a9169..da13328 100644
--- a/run_aiotest.py
+++ b/run_aiotest.py
@@ -1,4 +1,5 @@
import aiotest.run
+import sys
import trollius
if sys.platform == 'win32':
from trollius.windows_utils import socketpair
diff --git a/tox.ini b/tox.ini
index 1029df3..4fae0c8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,23 +2,29 @@
envlist = py26,py27,py32,py33,py34
[testenv]
+deps=
+ aiotest
setenv =
- TROLLIUSDEBUG = 1
-commands=python runtests.py -r {posargs}
+ TROLLIUSDEBUG = 1
+commands=
+ python runtests.py -r {posargs}
+ python run_aiotest.py -r {posargs}
[testenv:py26]
deps=
- futures
- mock
- ordereddict
- unittest2
+ aiotest
+ futures
+ mock
+ ordereddict
+ unittest2
[testenv:py27]
deps=
- futures
- mock
+ aiotest
+ futures
+ mock
[testenv:py32]
deps=
- mock
-
+ aiotest
+ mock