aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Nathaniel Manista <nathaniel@google.com>2016-09-20 11:16:16 -0700
committerGravatar GitHub <noreply@github.com>2016-09-20 11:16:16 -0700
commit3c9d086f51a51934e7d18cbb0ab5be2862fc7a1b (patch)
tree9959284142d9cc575b5d3b40d150da7ac11c82f4
parentfc92a0cc62c884fdaab33512adaa31123b8b8a08 (diff)
parentbd268492e876d7ea77217148dba45ee7b4979192 (diff)
Merge pull request #7893 from thunderboltsid/remove_shutdown_legacy_server
Remove erroneously redefined function from run_tests.py.
-rwxr-xr-xtools/run_tests/run_tests.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py
index c579f14f91..19931246cc 100755
--- a/tools/run_tests/run_tests.py
+++ b/tools/run_tests/run_tests.py
@@ -1198,18 +1198,6 @@ def _shut_down_legacy_server(legacy_server_port):
'http://localhost:%d/quitquitquit' % legacy_server_port).read()
-def _shut_down_legacy_server(legacy_server_port):
- try:
- version = int(urllib2.urlopen(
- 'http://localhost:%d/version_number' % legacy_server_port,
- timeout=10).read())
- except:
- pass
- else:
- urllib2.urlopen(
- 'http://localhost:%d/quitquitquit' % legacy_server_port).read()
-
-
def _start_port_server(port_server_port):
# check if a compatible port server is running
# if incompatible (version mismatch) ==> start a new one