From: Ben Darnell <ben@bendarnell.com>
Date: Sun, 29 Dec 2013 01:11:58 +0000 (-0500)
Subject: Mark another timing-sensitive test as skipOnTravis.
X-Git-Tag: v3.2.0b1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f55e070314ff945327f6a07db0605bb2719beec8;p=thirdparty%2Ftornado.git

Mark another timing-sensitive test as skipOnTravis.
---

diff --git a/tornado/test/websocket_test.py b/tornado/test/websocket_test.py
index 3c6e3a9a2..7eb6a1163 100644
--- a/tornado/test/websocket_test.py
+++ b/tornado/test/websocket_test.py
@@ -2,7 +2,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
+from tornado.test.util import unittest, skipOnTravis
 from tornado.web import Application, RequestHandler
 from tornado.websocket import WebSocketHandler, websocket_connect, WebSocketError, _websocket_mask_python
 
@@ -85,6 +85,7 @@ 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()