Merge pull request tornadoweb#707 from protoss-player/master

bdarnell · bdarnell · commit cc745780fe8f · 2013-04-08T19:49:29.000-07:00
websocket_connect should not hang on HTTP errors
diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py
@@ -32,3 +32,14 @@ def test_websocket_callbacks(self):
         ws.read_message(self.stop)
         response = self.wait().result()
         self.assertEqual(response, 'hello')
+    
+    @gen_test
+    def test_websocket_fail(self):
+        try:
+            ws = yield websocket_connect(
+                'ws://localhost:%d/no_websock' % self.get_http_port(),
+                io_loop=self.io_loop)
+        except:
+            pass
+        else:
+            self.fail('Should\'ve caught an Exception')
diff --git a/tornado/websocket.py b/tornado/websocket.py
@@ -746,6 +746,9 @@ def __init__(self, io_loop, request):
     def _on_close(self):
         self.on_message(None)
 
+    def _on_body(self, body):
+        self.connect_future.set_exception(Exception('Could not connect.'))
+
     def _handle_1xx(self, code):
         assert code == 101
         assert self.headers['Upgrade'].lower() == 'websocket'
