Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1)

Unified Diff: tools/testing/run_selenium.py

Issue 12090067: Speculative fix for flakines on browser bots (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/
Patch Set: Created 7 years, 11 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/testing/run_selenium.py
===================================================================
--- tools/testing/run_selenium.py (revision 17752)
+++ tools/testing/run_selenium.py (working copy)
@@ -86,7 +86,14 @@
browser.refresh()
try:
def pythonTimeout():
- close_browser(browser)
+ # The builtin quit call for chrome will call close on the RemoteDriver
+ # which may hang. Explicitly call browser.service.stop()
+ if (type(browser) is selenium.webdriver.chrome.webdriver.WebDriver):
+ # Browser may be dead
+ try:
+ browser.service.stop()
+ except:
+ print("Trying to close browser that has already been closed")
# If the browser is crashing selenium may not time out.
# Explicitly catch this case with a python timer.
t = threading.Timer(timeout, pythonTimeout)
@@ -237,17 +244,7 @@
type(browser) is not selenium.webdriver.ie.webdriver.WebDriver):
browser.close()
- # The builtin quit call will call close on the RemoteDriver which
- # may hang. Explicitly call browser.service.stop()
- if (type(browser) is selenium.webdriver.chrome.webdriver.WebDriver):
- # We may have called stop before if chrome was hanging.
- try:
- browser.service.stop()
- except:
- print("Trying to close browser that has already been closed")
- pass
- else:
- browser.quit()
+ browser.quit()
def report_results(mode, source, browser):
# TODO(vsm): Add a failure check for Dromaeo.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698