| commit | 3740bce80db2f729f2c7e58463e293400535ed6b | [log] [tgz] |
|---|---|---|
| author | toyoshim@chromium.org <toyoshim@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | Sat Oct 13 20:52:19 2012 +0000 |
| committer | toyoshim@chromium.org <toyoshim@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | Sat Oct 13 20:52:19 2012 +0000 |
| tree | ff406c1002bb4da83ee31ac0e30bc44e2005a9e3 | |
| parent | e04706625bfbc4475e8c9a300ea14c38db3aa693 [diff] [blame] |
WebSocket test server migration on ExtensionApiTest.WebSocket (fourth trial) WebSocket test server migration from content::TestWebSocketServer to net::TestServer. This is the first change to use net::TestServer as a WebSocket test server. Other changes will follow to obsoelte content::TestWebSocketServer. BUG=137639 TEST=browser_tests --gtest_filter='ExtensionApiTest.WebSocket' Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161304 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161542 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=161572 Review URL: https://chromiumcodereview.appspot.com/11087027 git-svn-id: http://src.chromium.org/svn/trunk/src/net/tools/testserver@161773 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/testserver.py b/testserver.py index 55bca1e..4870408 100755 --- a/testserver.py +++ b/testserver.py
@@ -2252,7 +2252,7 @@ # TODO(toyoshim): Remove following os.chdir. Currently this operation # is required to work correctly. It should be fixed from pywebsocket side. os.chdir(MakeDataDir()) - server = WebSocketServer(WebSocketOptions(host, port, MakeDataDir())) + server = WebSocketServer(WebSocketOptions(host, port, '.')) print 'WebSocket server started on %s:%d...' % (host, server.server_port) server_data['port'] = server.server_port elif options.server_type == SERVER_SYNC: