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

@@ -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()

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):

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