commit fab82d1625836e41617794f6e2c64dfb019991af
author Achuith Bhandarkar <achuith@chromium.org> Thu Feb 26 11:05:35 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Thu Feb 26 22:04:44 2015 +0000
tree 109cb1aadf460669f4df338655570454409a4d1f
parent 648eefd00396723d752c63cfc149dd88ce663090

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>

client/common_lib/cros/chrome.py

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