From e777e6fd6a9a64a482773489c8e1aae6a943c4ca Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Sun, 25 May 2014 00:48:15 -0400 Subject: [PATCH] Add TwistedIOLoop test on python 3 to tox and travis. --- .travis.yml | 2 +- tox.ini | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index efe7b074..cf63b335 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ script: - if [[ $TRAVIS_PYTHON_VERSION != pypy && $DEPS == true ]]; then python $TARGET --resolver=tornado.netutil.ThreadedResolver; fi - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then python $TARGET --httpclient=tornado.curl_httpclient.CurlAsyncHTTPClient; fi - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then python $TARGET --ioloop_time_monotonic; fi - - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then python $TARGET --ioloop=tornado.platform.twisted.TwistedIOLoop; fi + - if [[ $TRAVIS_PYTHON_VERSION != '3.2 && $DEPS == true ]]; then python $TARGET --ioloop=tornado.platform.twisted.TwistedIOLoop; fi - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then python $TARGET --resolver=tornado.platform.twisted.TwistedResolver; fi - if [[ $TRAVIS_PYTHON_VERSION != pypy && $DEPS == true ]]; then python $TARGET --resolver=tornado.platform.caresresolver.CaresResolver; fi - if [[ $TRAVIS_PYTHON_VERSION == '3.3' ]]; then python $TARGET --ioloop_time_monotonic; fi diff --git a/tox.ini b/tox.ini index 65b150ae..6a07c501 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ envlist = # Alternate IOLoops. py2-select, py3-select, - py2-twisted, py26-twisted, py2-twistedlayered, + py2-twisted, py26-twisted, py3-twisted, py2-twistedlayered, py3-asyncio, py33-asyncio, py26-trollius, py2-trollius, # Alternate Resolvers. @@ -177,6 +177,11 @@ basepython = python2.6 deps = {[testenv:py26-full]deps} commands = python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop {posargs:} +[testenv:py3-twisted] +basepython = python3.4 +deps = {[testenv:py34-full]deps} +commands = python -m tornado.test.runtests --ioloop=tornado.platform.twisted.TwistedIOLoop {posargs:} + [testenv:py2-twistedlayered] basepython = python2.7 deps = {[testenv:py27-full]deps}