websocket_test: test websocket_connect redirect raises exception

instead of "uncaught exception" and then test timeout

diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py
index 766b14b8617341d0e8ef2024c4c4fa545e21e0bc..befe06dd394fe22a540a66bbce4c13646098a24e 100644 (file)
--- a/tornado/test/websocket_test.py
+++ b/tornado/test/websocket_test.py
@@ -111,6 +111,11 @@ class NonWebSocketHandler(RequestHandler):
         self.write("ok")
 
 
+class RedirectHandler(RequestHandler):
+    def get(self):
+        self.redirect("/echo")
+
+
 class CloseReasonHandler(TestWebSocketHandler):
     def open(self):
         self.on_close_called = False
@@ -221,6 +226,7 @@ class WebSocketTest(WebSocketBaseTestCase):
             [
                 ("/echo", EchoHandler, dict(close_future=self.close_future)),
                 ("/non_ws", NonWebSocketHandler),
+                ("/redirect", RedirectHandler),
                 ("/header", HeaderHandler, dict(close_future=self.close_future)),
                 (
                     "/header_echo",
@@ -365,6 +371,11 @@ class WebSocketTest(WebSocketBaseTestCase):
         with self.assertRaises(WebSocketError):
             yield self.ws_connect("/non_ws")
 
+    @gen_test
+    def test_websocket_http_redirect(self):
+        with self.assertRaises(HTTPError):
+            yield self.ws_connect("/redirect")
+
     @gen_test
     def test_websocket_network_fail(self):
         sock, port = bind_unused_port()