Remove references to util.TimeoutException
https://codereview.chromium.org/952693003 moved TimeoutException.
chrome.py will need to reference the new location of TimeoutException when the above CL lands.
BUG=chromium:460625
TEST=login_ChromeProfileSanitary, bots
Change-Id: I00a2a7fc9cffacf23b306043296c2b5d6dd895c1
Reviewed-on: https://chromium-review.googlesource.com/254220
Reviewed-by: Toni Barzic <tbarzic@chromium.org>
Commit-Queue: Achuith Bhandarkar <achuith@chromium.org>
Trybot-Ready: Achuith Bhandarkar <achuith@chromium.org>
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
diff --git a/client/common_lib/cros/chrome.py b/client/common_lib/cros/chrome.py
index 740be8c..86ee4ee 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -98,7 +98,7 @@
browser_to_create = browser_finder.FindBrowser(finder_options)
self._browser = browser_to_create.Create(finder_options)
break
- except (util.TimeoutException, exceptions.LoginException) as e:
+ except (exceptions.LoginException) as e:
logging.error('Timed out logging in, tries=%d, error=%s',
i, repr(e))
if i == num_tries-1:
@@ -181,7 +181,7 @@
return False
try:
tabs[0].Close()
- except (util.TimeoutException):
+ except:
# crbug.com/350941
logging.error('Timed out closing tab')
return True
diff --git a/client/cros/multimedia/display_facade_native.py b/client/cros/multimedia/display_facade_native.py
index e93f591..03ae1ef 100644
--- a/client/cros/multimedia/display_facade_native.py
+++ b/client/cros/multimedia/display_facade_native.py
@@ -19,7 +19,8 @@
from autotest_lib.client.cros.graphics import graphics_utils
from autotest_lib.client.cros.multimedia import image_generator
-TimeoutException = telemetry.core.util.TimeoutException
+class TimeoutException(Exception):
+ pass
_FLAKY_CALL_RETRY_TIMEOUT_SEC = 60