tools/telemetry/telemetry/core/browser_finder.py - Issue 20672002: [telemetry] Add a webdriver backend with support for IE.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: tools/telemetry/telemetry/core/browser_finder.py

Issue 20672002: [telemetry] Add a webdriver backend with support for IE. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 7 years, 5 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 | tools/telemetry/telemetry/core/webdriver/__init__.py » ('j') | tools/telemetry/telemetry/core/webdriver/webdriver_browser_backend.py » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/browser_finder.py

diff --git a/tools/telemetry/telemetry/core/browser_finder.py b/tools/telemetry/telemetry/core/browser_finder.py

index b7ae6579e0672285332af78554f88e5e397dbc43..7e5c97ec26317eb6db523790437a5bf31d857d2c 100644

--- a/tools/telemetry/telemetry/core/browser_finder.py

+++ b/tools/telemetry/telemetry/core/browser_finder.py

@@ -8,8 +8,10 @@ import logging

from telemetry.core.chrome import android_browser_finder

from telemetry.core.chrome import cros_browser_finder

from telemetry.core.chrome import desktop_browser_finder

+from telemetry.core.webdriver import webdriver_desktop_browser_finder

ALL_BROWSER_TYPES = (

+ webdriver_desktop_browser_finder.ALL_BROWSER_TYPES + ',' +

desktop_browser_finder.ALL_BROWSER_TYPES + ',' +

android_browser_finder.ALL_BROWSER_TYPES + ',' +

cros_browser_finder.ALL_BROWSER_TYPES)

@@ -47,6 +49,8 @@ def FindBrowser(options):

raise BrowserTypeRequiredException('browser_type must be specified')

browsers = []

+ browsers.extend(

+ webdriver_desktop_browser_finder.FindAllAvailableBrowsers(options))

tonyg 2013/07/26 18:21:07 Note: You'll have to rebase after: https://chromiu

chrisgao (Use stgao instead) 2013/07/30 02:06:49 Done.

browsers.extend(desktop_browser_finder.FindAllAvailableBrowsers(options))

browsers.extend(android_browser_finder.FindAllAvailableBrowsers(options))

browsers.extend(cros_browser_finder.FindAllAvailableBrowsers(options))

@@ -81,6 +85,8 @@ def GetAllAvailableBrowserTypes(options):

improperly set or if an error occurs when finding a browser.

"""