commit 0998e1837a6ffe651d4a8697a39e25430e03ad50
author Achuith Bhandarkar <achuith@chromium.org> Mon Mar 17 16:44:21 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Fri Mar 21 23:59:15 2014 +0000
tree ec410f54afc93e5e156be3024295ff37bedc07bd
parent 4d02b37c58e11de374a1ab42466593b14860a2a5

Catch timeout exception and continue.

This fixes a flake in login_ChromeProfileSanitary.

BUG=chromium:350941
TEST=manual

Change-Id: I964fdd455259a6a25314049b71606e65363a0fd0
Reviewed-on: https://chromium-review.googlesource.com/190420
Tested-by: Achuith Bhandarkar <achuith@chromium.org>
Reviewed-by: Dan Shi <dshi@chromium.org>
Commit-Queue: 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 3576bc9..40acff4 100644
--- a/client/common_lib/cros/chrome.py
+++ b/client/common_lib/cros/chrome.py
@@ -146,7 +146,11 @@
             except (exceptions.BrowserGoneException,
                     exceptions.BrowserConnectionGoneException):
                 return False
-            tab.Close()
+            try:
+                tab.Close()
+            except (util.TimeoutException):
+                # crbug.com/350941
+                logging.error('Timed out closing tab')
             return True
         util.WaitFor(lambda: _BrowserReady(self), timeout=10)