diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 20:26:08 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-19 20:26:08 +0000 |
| commit | adb0428576b6cdbbc9542319b5af8309057a17d1 (patch) | |
| tree | 821e63d1e5d1260b52e749827b925adf4b591e7b /net/tools/testserver | |
| parent | 1e9ac2665b9a6b8a0f4dfffd33462dcea1a6168c (diff) | |
| download | chromium_src-adb0428576b6cdbbc9542319b5af8309057a17d1.zip chromium_src-adb0428576b6cdbbc9542319b5af8309057a17d1.tar.gz chromium_src-adb0428576b6cdbbc9542319b5af8309057a17d1.tar.bz2 | |
GTTF: Remove TryKillingOldServer from testserver.py, it's broken.
Sometimes TryKillingOldServer fails with an exception we don't catch,
which is even worse because then the new server fails to start.
We should rely on the C++ code to kill the server in a reliable way,
rather than this Python hack.
TEST=net_unittests, unit_tests, ui_tests, ...
BUG=52644
Review URL: http://codereview.chromium.org/3110025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56736 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/testserver')
| -rw-r--r-- | net/tools/testserver/testserver.py | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/net/tools/testserver/testserver.py b/net/tools/testserver/testserver.py index 6c9ef83..c2fd51f 100644 --- a/net/tools/testserver/testserver.py +++ b/net/tools/testserver/testserver.py @@ -1197,17 +1197,6 @@ def MakeDataDir(): return my_data_dir -def TryKillingOldServer(port): - # Note that an HTTP /kill request to the FTP server has the effect of - # killing it. - for protocol in ["http", "https"]: - try: - urllib2.urlopen("%s://localhost:%d/kill" % (protocol, port)).read() - print "Killed old server instance on port %d (via %s)" % (port, protocol) - except urllib2.URLError: - # Common case, indicates no server running. - pass - class FileMultiplexer: def __init__(self, fd1, fd2) : self.__fd1 = fd1 @@ -1234,9 +1223,6 @@ def main(options, args): port = options.port - # Try to free up the port if there's an orphaned old instance. - TryKillingOldServer(port) - if options.server_type == SERVER_HTTP: if options.cert: # let's make sure the cert file exists. |