From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 19 May 2014 01:57:27 +0000 (-0400)
Subject: Remove test_websocket_network_timeout.
X-Git-Tag: v4.0.0b1~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ce62ed9b1886b3e0f2c11007ab16d299dd7fa784;p=thirdparty%2Ftornado.git

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.
---

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,