From ce62ed9b1886b3e0f2c11007ab16d299dd7fa784 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Sun, 18 May 2014 21:57:27 -0400 Subject: [PATCH] Remove test_websocket_network_timeout. It wasn't testing what it appeared to be (it was hitting exactly the same code paths as test_websocket_network_fail on posix, but was failing on windows). Closes #1054. --- tornado/test/websocket_test.py | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py index 648e5d8ca..99ded1b80 100644 --- a/tornado/test/websocket_test.py +++ b/tornado/test/websocket_test.py @@ -6,7 +6,7 @@ from tornado.concurrent import Future from tornado.httpclient import HTTPError, HTTPRequest from tornado.log import gen_log from tornado.testing import AsyncHTTPTestCase, gen_test, bind_unused_port, ExpectLog -from tornado.test.util import unittest, skipOnTravis +from tornado.test.util import unittest from tornado.web import Application, RequestHandler try: @@ -109,23 +109,11 @@ class WebSocketTest(AsyncHTTPTestCase): 'ws://localhost:%d/non_ws' % self.get_http_port(), io_loop=self.io_loop) - @skipOnTravis - @gen_test - def test_websocket_network_timeout(self): - sock, port = bind_unused_port() - sock.close() - with self.assertRaises(IOError) as cm: - with ExpectLog(gen_log, ".*"): - yield websocket_connect( - 'ws://localhost:%d/' % port, - io_loop=self.io_loop, - connect_timeout=0.01) - @gen_test def test_websocket_network_fail(self): sock, port = bind_unused_port() sock.close() - with self.assertRaises(IOError) as cm: + with self.assertRaises(IOError): with ExpectLog(gen_log, ".*"): yield websocket_connect( 'ws://localhost:%d/' % port, -- 2.47.2