Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(880)

Unified Diff: tools/testrunner/server/main.py

Issue 10983084: Test runner: fix outdated "import discovery" (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | tools/testrunner/server/status_handler.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testrunner/server/main.py
diff --git a/tools/testrunner/server/main.py b/tools/testrunner/server/main.py
index 9c7eafb48d2482520184e0c08f32caceb5c77449..1000713ca93d4c79d98e9fa3d57abf7107dec62b 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()
« no previous file with comments | « no previous file | tools/testrunner/server/status_handler.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698