summaryrefslogtreecommitdiffstats
path: root/net/tools
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 19:42:26 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-11-26 19:42:26 +0000
commit2b7f5ee7da99ee353b5e44255c20fbd1b56d94e7 (patch)
tree78cc5ce6eb27123f8a6d1282e5f3894929835cad /net/tools
parent6dc514f162ccb15e14d92e7169069764d9f8e82f (diff)
downloadchromium_src-2b7f5ee7da99ee353b5e44255c20fbd1b56d94e7.zip
chromium_src-2b7f5ee7da99ee353b5e44255c20fbd1b56d94e7.tar.gz
chromium_src-2b7f5ee7da99ee353b5e44255c20fbd1b56d94e7.tar.bz2
Added server_data json dictionary to testserver.py
This is split off from 5196001. BUG=53934 TEST=manually TBR=cbentzel Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67428 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=67437 Review URL: http://codereview.chromium.org/5262005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67467 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools')
-rwxr-xr-xnet/tools/testserver/testserver.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py
index 0dbe4c4..e3e1176 100755
--- a/net/tools/testserver/testserver.py
+++ b/net/tools/testserver/testserver.py
@@ -1322,6 +1322,10 @@ def main(options, args):
# Notify the parent that we've started. (BaseServer subclasses
# bind their sockets on construction.)
if options.startup_pipe is not None:
+ server_data = {
+ 'port': listen_port
+ }
+ server_data_json = simplejson.dumps(server_data)
if sys.platform == 'win32':
fd = msvcrt.open_osfhandle(options.startup_pipe, 0)
else: