commit c437304a0a590ffc7f4fbfe017c6a1ce9d1697f2
author kochi@chromium.org <kochi@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Fri Oct 12 10:08:09 2012 +0000
committer kochi@chromium.org <kochi@chromium.org@4ff67af0-8c30-449e-8e8b-ad334ec8d88c> Fri Oct 12 10:08:09 2012 +0000
tree 16f554234af032df3ef8c1d84fa708f0234cd42f
parent 6c29958fd7dbf7096b41305bb005bced100ded2a

Revert 161542 - 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

TBR=toyoshim@chromium.org
Review URL: https://codereview.chromium.org/11114015

git-svn-id: http://src.chromium.org/svn/trunk/src/net/tools/testserver@161549 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

testserver.py

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: