From: Ben Darnell Date: Sun, 8 Apr 2018 17:57:59 +0000 (-0400) Subject: test: Fix some rot in lesser-used test configs X-Git-Tag: v5.1.0b1~30^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2350%2Fhead;p=thirdparty%2Ftornado.git test: Fix some rot in lesser-used test configs --- diff --git a/tornado/test/runtests.py b/tornado/test/runtests.py index d5bd769c9..e4f938d39 100644 --- a/tornado/test/runtests.py +++ b/tornado/test/runtests.py @@ -137,6 +137,8 @@ def main(): # 2.7 and 3.2 warnings.filterwarnings("ignore", category=DeprecationWarning, message="Please use assert.* instead") + warnings.filterwarnings("ignore", category=PendingDeprecationWarning, + message="Please use assert.* instead") # Twisted 15.0.0 triggers some warnings on py3 with -bb. warnings.filterwarnings("ignore", category=BytesWarning, module=r"twisted\..*") diff --git a/tornado/test/tcpclient_test.py b/tornado/test/tcpclient_test.py index c5a833429..d7de42237 100644 --- a/tornado/test/tcpclient_test.py +++ b/tornado/test/tcpclient_test.py @@ -77,7 +77,7 @@ class TCPClientTest(AsyncTestCase): def skipIfLocalhostV4(self): # The port used here doesn't matter, but some systems require it # to be non-zero if we do not also pass AI_PASSIVE. - addrinfo = yield Resolver().resolve('localhost', 80) + addrinfo = self.io_loop.run_sync(lambda: Resolver().resolve('localhost', 80)) families = set(addr[0] for addr in addrinfo) if socket.AF_INET6 not in families: self.skipTest("localhost does not resolve to ipv6") diff --git a/tox.ini b/tox.ini index c8c4b67fd..ddc6af28a 100644 --- a/tox.ini +++ b/tox.ini @@ -35,7 +35,8 @@ envlist = {py2,py3}-full-caresresolver, # Other configurations; see comments below. - {py2,py3}-{monotonic,opt}, + py2-monotonic, + {py2,py3}-opt, py3-{lang_c,lang_utf8}, py2-locale, {py27,py3}-unittest2,