summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 19:14:53 +0000
committerachuith@chromium.org <achuith@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-14 19:14:53 +0000
commit0b822f208263d15b9eca6b40ab9816a62879c09c (patch)
tree41bda03328bf430f137ec2067d1da54b6fefb08b /tools
parentf9feef3e16ca7e95cbd0e1a1586ed443f5686b42 (diff)
downloadchromium_src-0b822f208263d15b9eca6b40ab9816a62879c09c.zip
chromium_src-0b822f208263d15b9eca6b40ab9816a62879c09c.tar.gz
chromium_src-0b822f208263d15b9eca6b40ab9816a62879c09c.tar.bz2
Revert 256655 "Fix a situation where tab creation can throw an e..."
> Fix a situation where tab creation can throw an exception and we never navigate to about:blank. > > BUG=349447,352428 > TEST=manual > NOTRY=True > > Review URL: https://codereview.chromium.org/197103004 TBR=achuith@chromium.org Review URL: https://codereview.chromium.org/195913003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257174 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools')
-rw-r--r--tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py8
1 files changed, 2 insertions, 6 deletions
diff --git a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
index 20a4820e..88feeb3 100644
--- a/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
+++ b/tools/telemetry/telemetry/core/backends/chrome/cros_browser_backend.py
@@ -431,15 +431,11 @@ class CrOSBrowserBackend(chrome_browser_backend.ChromeBrowserBackend):
else:
# Workaround for crbug.com/329271, crbug.com/334726.
retries = 3
- while True:
+ while not len(self.tab_list_backend):
try:
# Open a new window/tab.
- if len(self.tab_list_backend):
- tab = self.tab_list_backend[-1]
- else:
- tab = self.tab_list_backend.New(timeout=30)
+ tab = self.tab_list_backend.New(timeout=30)
tab.Navigate('about:blank', timeout=10)
- break
except (exceptions.TabCrashException, util.TimeoutException,
IndexError):
retries -= 1