| commit | e04706625bfbc4475e8c9a300ea14c38db3aa693 | [log] [tgz] |
|---|---|---|
| author | mrossetti@chromium.org <mrossetti@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | Fri Oct 12 15:00:12 2012 +0000 |
| committer | mrossetti@chromium.org <mrossetti@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> | Fri Oct 12 15:00:12 2012 +0000 |
| tree | 16f554234af032df3ef8c1d84fa708f0234cd42f | |
| parent | ce46687c55bb7fae6d808a083bbba28409b71e2d [diff] [blame] |
Revert 161572 - WebSocket test server migration on ExtensionApiTest.WebSocket (third 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_test --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 Review URL: https://chromiumcodereview.appspot.com/11087027 TBR=toyoshim@chromium.org Review URL: https://codereview.chromium.org/11115011 git-svn-id: http://src.chromium.org/svn/trunk/src/net/tools/testserver@161575 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
diff --git a/testserver.py b/testserver.py index 4870408..55bca1e 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, '.')) + server = WebSocketServer(WebSocketOptions(host, port, MakeDataDir())) print 'WebSocket server started on %s:%d...' % (host, server.server_port) server_data['port'] = server.server_port elif options.server_type == SERVER_SYNC: