diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 20:52:19 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-13 20:52:19 +0000 |
| commit | 098702478bff9d6771deca7dbd63b02b1ca64a4a (patch) | |
| tree | 8d237762429b84b1efe9e64dff79bedf48d48d6c /net | |
| parent | 12f0b986f304aa9943e3dd82dea7a6a243db7ffa (diff) | |
| download | chromium_src-098702478bff9d6771deca7dbd63b02b1ca64a4a.zip chromium_src-098702478bff9d6771deca7dbd63b02b1ca64a4a.tar.gz chromium_src-098702478bff9d6771deca7dbd63b02b1ca64a4a.tar.bz2 | |
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: svn://svn.chromium.org/chrome/trunk/src@161773 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/data/websocket/echo_wsh.py | 18 | ||||
| -rwxr-xr-x | net/tools/testserver/testserver.py | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/net/data/websocket/echo_wsh.py b/net/data/websocket/echo_wsh.py new file mode 100644 index 0000000..86ab63c --- /dev/null +++ b/net/data/websocket/echo_wsh.py @@ -0,0 +1,18 @@ +# Copyright (c) 2012 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +def web_socket_do_extra_handshake(request): + pass # Always accept. + + +def web_socket_transfer_data(request): + while True: + line = request.ws_stream.receive_message() + if line is None: + return + if isinstance(line, unicode): + request.ws_stream.send_message(line, binary=False) + else: + request.ws_stream.send_message(line, binary=True) + diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 55bca1e..4870408 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, 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: |