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

Unified Diff: tools/telemetry/telemetry/core/backends/webdriver/webdriver_desktop_browser_finder.py

Issue 760653002: Telemetry --device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 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
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 66b4aece591eba1681b8d39e0e3a76108f2f54b0..0373e1ca744108c74f983272735ec11ae6f9d7bf 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,6 +12,7 @@ from telemetry.core import platform as platform_module
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 desktop_device
from telemetry.util import support_binaries
# Try to import the selenium python lib which may be not available.
@@ -96,8 +97,11 @@ def FindAllBrowserTypes(_):
'https://code.google.com/p/selenium/wiki/PythonBindings.')
return []
-def FindAllAvailableBrowsers(finder_options):
+def FindAllAvailableBrowsers(finder_options, device):
"""Finds all the desktop browsers available on this machine."""
+ if not isinstance(device, desktop_device.DesktopDevice):
+ return []
+
browsers = []
if not webdriver:
return browsers

Powered by Google App Engine
This is Rietveld 408576698