diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 07:01:21 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-11 07:01:21 +0000 |
| commit | 2d57a5171d2ef0afdabc79a2d89b42a3bebfee0a (patch) | |
| tree | 1b15ff0197cd017cffa38b0dbf9bd8a7ab9241fa /net/tools/testserver | |
| parent | c75a4dc8dd9bd176d51556a9c74d4e7f5e201e63 (diff) | |
| download | chromium_src-2d57a5171d2ef0afdabc79a2d89b42a3bebfee0a.zip chromium_src-2d57a5171d2ef0afdabc79a2d89b42a3bebfee0a.tar.gz chromium_src-2d57a5171d2ef0afdabc79a2d89b42a3bebfee0a.tar.bz2 | |
Revert 161304 - WebSocket test server migration on ExtensionApiTest.WebSocket
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'
Review URL: https://chromiumcodereview.appspot.com/11087027
TBR=toyoshim@chromium.org
Review URL: https://codereview.chromium.org/11091059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161308 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/testserver')
| -rwxr-xr-x | net/tools/testserver/testserver.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 4870408..55bca1e 100755 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -2252,7 +2252,7 @@ def main(options, args): # 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: |