From 4a6c2a8f097c974a37c4aa1dd1953b652cb1662a Mon Sep 17 00:00:00 2001 From: "jkummerow@chromium.org" Date: Fri, 28 Sep 2012 15:11:33 +0000 Subject: [PATCH] Test runner: fix outdated "import discovery" Review URL: https://codereview.chromium.org/10983084 git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12633 ce2b1a6d-e550-0410-aec6-3dcde31c8c00 --- tools/testrunner/server/main.py | 6 +++--- tools/testrunner/server/status_handler.py | 1 - tools/testrunner/server/work_handler.py | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/tools/testrunner/server/main.py b/tools/testrunner/server/main.py index 9c7eafb48d..1000713ca9 100644 --- a/tools/testrunner/server/main.py +++ b/tools/testrunner/server/main.py @@ -34,8 +34,8 @@ import threading import time from . import daemon -from . import discovery from . import local_handler +from . import presence_handler from . import signatures from . import status_handler from . import work_handler @@ -77,7 +77,7 @@ class Server(daemon.Daemon): def run(self): os.nice(20) - self.ip = discovery.GetOwnIP() + self.ip = presence_handler.GetOwnIP() self.perf_data_manager = perfdata.PerfDataManager(self.datadir) self.perf_data_lock = threading.Lock() @@ -96,7 +96,7 @@ class Server(daemon.Daemon): target=self.status_handler.serve_forever) self.status_handler_thread.start() - self.presence_daemon = discovery.PresenceDaemon(self) + self.presence_daemon = presence_handler.PresenceDaemon(self) self.presence_daemon_thread = threading.Thread( target=self.presence_daemon.serve_forever) self.presence_daemon_thread.start() diff --git a/tools/testrunner/server/status_handler.py b/tools/testrunner/server/status_handler.py index ab4cae0aa7..3f2271dc69 100644 --- a/tools/testrunner/server/status_handler.py +++ b/tools/testrunner/server/status_handler.py @@ -31,7 +31,6 @@ import SocketServer from . import compression from . import constants -from . import discovery def _StatusQuery(peer, query): diff --git a/tools/testrunner/server/work_handler.py b/tools/testrunner/server/work_handler.py index e30c636faa..d1e0666c41 100644 --- a/tools/testrunner/server/work_handler.py +++ b/tools/testrunner/server/work_handler.py @@ -34,7 +34,6 @@ import threading from . import compression from . import constants -from . import discovery from . import signatures from ..network import endpoint from ..objects import workpacket