tools/telemetry/telemetry/core/util.py - Issue 952693003: Telemetry: Move TimeoutException from util module to exceptions module.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/util.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

« no previous file with comments | « tools/telemetry/telemetry/core/forwarders/do_nothing_forwarder_unittest.py ('k') | tools/telemetry/telemetry/core/util_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/util.py

diff --git a/tools/telemetry/telemetry/core/util.py b/tools/telemetry/telemetry/core/util.py

index e155eb05b8b61f96fa40362d9406eaaf8c8b983d..d15765039ddbe8a337595e7e4b6a89b802d7c556 100644

--- a/tools/telemetry/telemetry/core/util.py

+++ b/tools/telemetry/telemetry/core/util.py

@@ -10,9 +10,7 @@ import socket

import sys

import time

-class TimeoutException(Exception):

- pass

+from telemetry.core import exceptions

def GetBaseDir():

@@ -80,8 +78,8 @@ def WaitFor(condition, timeout):

elapsed_time = now - start_time

last_output_elapsed_time = now - last_output_time

if elapsed_time > timeout:

- raise TimeoutException('Timed out while waiting %ds for %s.' %

- (timeout, GetConditionString()))

+ raise exceptions.TimeoutException('Timed out while waiting %ds for %s.' %

+ (timeout, GetConditionString()))

if last_output_elapsed_time > output_interval:

logging.info('Continuing to wait %ds for %s. Elapsed: %ds.',

timeout, GetConditionString(), elapsed_time)