tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py - Issue 238513003: [Telemetry] Make Telemetry binaries platform aware.

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/backends/webdriver/webdriver_desktop_browser_finder.py

Issue 238513003: [Telemetry] Make Telemetry binaries platform aware. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: move to util/ Created 6 years, 8 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 | « tools/telemetry/telemetry/core/backends/chrome/desktop_browser_backend.py ('k') | tools/telemetry/telemetry/core/bitmap.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py

diff --git a/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py b/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py

index d9fe3f3ea97888e274b9363e91e8dd923974760d..83d95649c06d971bd523f7b4e31d8ab6aa7fdb62 100644

--- a/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py

+++ b/tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py

@@ -12,7 +12,7 @@ from telemetry.core import possible_browser

from telemetry.core import util

from telemetry.core.backends.webdriver import webdriver_ie_backend

from telemetry.core.platform import factory

-from telemetry.page import cloud_storage

+from telemetry.util import support_binaries

# Try to import the selenium python lib which may be not available.

util.AddDirToPythonPath(

@@ -75,9 +75,8 @@ class PossibleDesktopIE(PossibleWebDriverBrowser):

def CreateWebDriverBackend(self, platform_backend):

assert webdriver

def DriverCreator():

- ie_driver_exe = os.path.join(util.GetTelemetryDir(), 'bin',

- 'IEDriverServer_%s.exe' % self._architecture)

- cloud_storage.GetIfChanged(ie_driver_exe, cloud_storage.PUBLIC_BUCKET)

+ ie_driver_exe = support_binaries.FindPath(

+ 'IEDriverServer_%s' % self._architecture, 'win')

return webdriver.Ie(executable_path=ie_driver_exe)

return webdriver_ie_backend.WebDriverIEBackend(

platform_backend, DriverCreator, self.finder_options.browser_options)