diff --git a/.travis.yml b/.travis.yml index e94f5cd3..1252caca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,8 @@ env: install: # always install unittest2 on py26 even if $DEPS is unset - if [[ $TRAVIS_PYTHON_VERSION == '2.6' ]]; then travis_retry pip install unittest2; fi - - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then travis_retry pip install futures mock Monotime==1.0 singledispatch; fi + - if [[ $TRAVIS_PYTHON_VERSION == 2* && $DEPS == true ]]; then travis_retry pip install futures mock Monotime==1.0; fi + - if [[ $TRAVIS_PYTHON_VERSION == '2.7' ]]; then travis_retry pip install singledispatch; fi - if [[ $TRAVIS_PYTHON_VERSION == 'pypy' && $DEPS == true ]]; then travis_retry pip install futures mock singledispatch; fi # TODO(bdarnell): pycares tests are currently disabled on travis due to ipv6 issues. #- if [[ $TRAVIS_PYTHON_VERSION != 'pypy'* && $DEPS == true ]]; then travis_retry pip install pycares; fi diff --git a/tornado/test/twisted_test.py b/tornado/test/twisted_test.py index 3ceffa77..a1a2e24c 100644 --- a/tornado/test/twisted_test.py +++ b/tornado/test/twisted_test.py @@ -482,6 +482,7 @@ class CompatibilityTests(unittest.TestCase): self.assertEqual(response, 'Hello from tornado!') +@skipIfNoTwisted @skipIfNoSingleDispatch class ConvertDeferredTest(unittest.TestCase): def test_success(self): diff --git a/tox.ini b/tox.ini index 7aec7faf..65bf59ac 100644 --- a/tox.ini +++ b/tox.ini @@ -81,8 +81,9 @@ deps = {py2,py26,py27,pypy}-full: futures # mock became standard in py33 {py2,py26,py27,pypy,py3,py32,pypy3}-full: mock - # singledispatch became standard in py34 - {py2,py26,py27,pypy,py3,py32,py33}-full: singledispatch + # singledispatch became standard in py34. It mostly works on py26 + # but has problems with old-style classes as used in that version. + {py2,py27,pypy,py3,py32,py33}-full: singledispatch py33-asyncio: asyncio trollius: trollius py2-monotonic: Monotime