Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(171)

Unified Diff: tools/telemetry/telemetry/core/backends/chrome/websocket_unittest.py

Issue 480643002: [Telemetry] Reduce testSockOpts by 5s on mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/telemetry/telemetry/core/backends/chrome/websocket_unittest.py
diff --git a/tools/telemetry/telemetry/core/backends/chrome/websocket_unittest.py b/tools/telemetry/telemetry/core/backends/chrome/websocket_unittest.py
index 395bdd3f011dd211a61f65a2b363bb5ff28f292e..e72068dce5e31833c57ae1d094273fdd451272e6 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/websocket_unittest.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/websocket_unittest.py
@@ -37,18 +37,25 @@ class TestWebSocket(unittest.TestCase):
self.assertNotEqual(websocket.WebSocketTimeoutException, None)
def testSockOpts(self):
- httpd = BaseHTTPServer.HTTPServer(('', 0), _FakeWebSocketHandler)
- threading.Thread(target=httpd.handle_request).start()
+ httpd = BaseHTTPServer.HTTPServer(('127.0.0.1', 0), _FakeWebSocketHandler)
ws_url = 'ws://127.0.0.1:%d' % httpd.server_port
+
+ threading.Thread(target=httpd.handle_request).start()
ws = websocket.create_connection(ws_url)
- self.assertNotEquals(
- ws.sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR), 0)
+ try:
dtu 2014/08/16 00:41:45 Alternatively: with contextlib.closing(websocket.
+ self.assertNotEquals(
+ ws.sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR), 0)
+ finally:
+ ws.close()
threading.Thread(target=httpd.handle_request).start()
ws = websocket.create_connection(
ws_url,
sockopt=[(socket.IPPROTO_TCP, socket.TCP_NODELAY, 1)])
- self.assertNotEquals(
- ws.sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR), 0)
- self.assertNotEquals(
- ws.sock.getsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY), 0)
+ try:
+ self.assertNotEquals(
+ ws.sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR), 0)
+ self.assertNotEquals(
+ ws.sock.getsockopt(socket.IPPROTO_TCP, socket.TCP_NODELAY), 0)
+ finally:
+ ws.close()
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698