diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 15:00:12 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 15:00:12 +0000 |
| commit | 4fd165feb4a1fe29c73d56e2c3736ab12380b0f6 (patch) | |
| tree | 7227adc68e647a123c3a743699fbd2d4626781d6 /net | |
| parent | e83b39f504b953fdf79f38feac14855e250240ca (diff) | |
| download | chromium_src-4fd165feb4a1fe29c73d56e2c3736ab12380b0f6.zip chromium_src-4fd165feb4a1fe29c73d56e2c3736ab12380b0f6.tar.gz chromium_src-4fd165feb4a1fe29c73d56e2c3736ab12380b0f6.tar.bz2 | |
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: svn://svn.chromium.org/chrome/trunk/src@161575 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, 1 insertions, 19 deletions
diff --git a/net/data/websocket/echo_wsh.py b/net/data/websocket/echo_wsh.py deleted file mode 100644 index 86ab63c..0000000 --- a/net/data/websocket/echo_wsh.py +++ /dev/null @@ -1,18 +0,0 @@ -# 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 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: |