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

Unified Diff: tools/telemetry/telemetry/core/webpagereplay.py

Issue 952693003: Telemetry: Move TimeoutException from util module to exceptions module. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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
Index: tools/telemetry/telemetry/core/webpagereplay.py
diff --git a/tools/telemetry/telemetry/core/webpagereplay.py b/tools/telemetry/telemetry/core/webpagereplay.py
index cebc6613c09bd5259835893cb60b04ea70f911a7..c553fe0f2a973cdf239fc188f6e8d1439d3d8548 100644
--- a/tools/telemetry/telemetry/core/webpagereplay.py
+++ b/tools/telemetry/telemetry/core/webpagereplay.py
@@ -12,6 +12,7 @@ import subprocess
import sys
import urllib
+from telemetry.core import exceptions
from telemetry.core import util
_REPLAY_DIR = os.path.join(
@@ -203,7 +204,7 @@ class ReplayServer(object):
self._started_ports['https'],
self._started_ports.get('dns'), # None if unused
)
- except util.TimeoutException:
+ except exceptions.TimeoutException:
raise ReplayNotStartedError(
'Web Page Replay failed to start. Log output:\n%s' %
''.join(self._LogLines()))
@@ -223,7 +224,7 @@ class ReplayServer(object):
try:
util.WaitFor(lambda: self.replay_process.poll() is not None, 10)
- except util.TimeoutException:
+ except exceptions.TimeoutException:
try:
# Use a SIGINT so that it can do graceful cleanup.
self.replay_process.send_signal(signal.SIGINT)
« no previous file with comments | « tools/telemetry/telemetry/core/web_contents.py ('k') | tools/telemetry/telemetry/page/actions/action_runner_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698