Reviewers: Michael Starzinger,
Message:
PTAL.
Description:
Test runner: fix outdated "import discovery"
Please review this at https://codereview.chromium.org/10983084/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M tools/testrunner/server/main.py
M tools/testrunner/server/status_handler.py
M tools/testrunner/server/work_handler.py
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()
Index: tools/testrunner/server/status_handler.py
diff --git a/tools/testrunner/server/status_handler.py
b/tools/testrunner/server/status_handler.py
index
ab4cae0aa7e930e2db6ea146c3f501522435db0e..3f2271dc697597a68791e7dbd7877012b5050f07
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):
Index: tools/testrunner/server/work_handler.py
diff --git a/tools/testrunner/server/work_handler.py
b/tools/testrunner/server/work_handler.py
index
e30c636faa3e0979ca107f07d11ca035471a5e96..d1e0666c41790bc7bae2f96a08fe2b12736f1260
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
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
