Test runner: fix outdated "import discovery"

tools/testrunner/server/main.py

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 16 matching lines @@
 
 
 import multiprocessing
 import os
 import shutil
 import subprocess
 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
 from ..network import perfdata
 
 
 class Server(daemon.Daemon):
 
   def __init__(self, pidfile, root, stdin="/dev/null",
                stdout="/dev/null", stderr="/dev/null"):
@@ skipping 21 matching lines @@
       with open(self.relative_perf_filename) as f:
         try:
           self.relative_perf = float(f.read())
         except:
           self.relative_perf = 1.0
     else:
       self.relative_perf = 1.0
 
   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()
 
     self.local_handler = local_handler.LocalSocketServer(self)
     self.local_handler_thread = threading.Thread(
         target=self.local_handler.serve_forever)
     self.local_handler_thread.start()
 
     self.work_handler = work_handler.WorkSocketServer(self)
     self.work_handler_thread = threading.Thread(
         target=self.work_handler.serve_forever)
     self.work_handler_thread.start()
 
     self.status_handler = status_handler.StatusSocketServer(self)
     self.status_handler_thread = threading.Thread(
         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()
 
     self.presence_daemon.FindPeers()
     time.sleep(0.5)  # Give those peers some time to reply.
 
     with self.peer_list_lock:
       for p in self.peers:
         if p.address == self.ip: continue
@@ skipping 126 matching lines @@
   def CompareOwnPerf(self, test, arch, mode):
     data_store = self.perf_data_manager.GetStore(arch, mode)
     observed = data_store.FetchPerfData(test)
     if not observed: return
     own_perf_estimate = observed / test.duration
     with self.perf_data_lock:
       kLearnRateLimiter = 9999
       self.relative_perf *= kLearnRateLimiter
       self.relative_perf += own_perf_estimate
       self.relative_perf /= (kLearnRateLimiter + 1)