diff options
| author | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 09:19:30 +0000 |
|---|---|---|
| committer | toyoshim@chromium.org <toyoshim@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-12 09:19:30 +0000 |
| commit | 568822d1c923b41e53238ff2f7747772262bc702 (patch) | |
| tree | 54ed38e88444f076070de6c08f9b0c29a6a59ac1 /net/tools | |
| parent | 8fa35cc063f238403da99fd9681cb4bf18ffe0d8 (diff) | |
| download | chromium_src-568822d1c923b41e53238ff2f7747772262bc702.zip chromium_src-568822d1c923b41e53238ff2f7747772262bc702.tar.gz chromium_src-568822d1c923b41e53238ff2f7747772262bc702.tar.bz2 | |
WebSocket test server migration on ExtensionApiTest.WebSocket (retry)
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
Review URL: https://chromiumcodereview.appspot.com/11087027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@161542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
| -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 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: |