From: Color Fuzzy <color.fuzzy@gmail.com>
Date: Tue, 22 Dec 2015 03:26:04 +0000 (+0800)
Subject: replace BlockingResolver with Resolver and update timeout value because of resolve... 
X-Git-Tag: v4.4.0b1~59^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fdffc4c8910f136e34bb21faa7b93c8d0ed44a4;p=thirdparty%2Ftornado.git

replace BlockingResolver with Resolver and update timeout value because of resolve never completes
---

diff --git a/tornado/test/simple_httpclient_test.py b/tornado/test/simple_httpclient_test.py
index 52bae50d6..0f60aba7c 100644
--- a/tornado/test/simple_httpclient_test.py
+++ b/tornado/test/simple_httpclient_test.py
@@ -18,7 +18,7 @@ from tornado.httputil import HTTPHeaders, ResponseStartLine
 from tornado.ioloop import IOLoop
 from tornado.log import gen_log
 from tornado.concurrent import Future
-from tornado.netutil import Resolver, bind_sockets, BlockingResolver
+from tornado.netutil import Resolver, bind_sockets
 from tornado.simple_httpclient import SimpleAsyncHTTPClient
 from tornado.test.httpclient_test import ChunkHandler, CountdownHandler, HelloWorldHandler, RedirectHandler
 from tornado.test import httpclient_test
@@ -240,16 +240,12 @@ class SimpleHTTPClientTestMixin(object):
 
     @skipOnTravis
     def test_connect_timeout(self):
-        # 0.1 and 0.5(nt) is copied from `self.test_request_timeout`
         timeout = 0.1
-        timeout_min, timeout_max = 0.099, 0.15
-        if os.name == 'nt':
-            timeout = 0.5
-            timeout_min, timeout_max = 0.4, 0.6
+        timeout_min, timeout_max = 0.099, 1.0
 
-        class TimeoutResolver(BlockingResolver):
+        class TimeoutResolver(Resolver):
             def resolve(self, *args, **kwargs):
-                return Future()
+                return Future()  # never completes
 
         with closing(self.create_client(resolver=TimeoutResolver())) as client:
             client.fetch(self.get_url('/hello'), self.stop,