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 472913002: Move ALL_BROWSER_TYPES constant to a FindAllBrowsers() function, so that it doesn't run unnecessari… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Renamed FindAllBrowsers to FindAllBrowserTypes Created 6 years, 4 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 e0f43a5d2a8c50ea9fb6f1097f13e8d77c1cb003..c89594c9788f423f0d979a214fe622c752801e3f 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
@@ -22,16 +22,6 @@ try:
except ImportError:
webdriver = None
-ALL_BROWSER_TYPES = []
-if webdriver:
- ALL_BROWSER_TYPES = [
- 'internet-explorer',
- 'internet-explorer-x64']
-else:
- logging.warning('Webdriver backend is unsupported without selenium pylib. '
- 'For installation of selenium pylib, please refer to '
- 'https://code.google.com/p/selenium/wiki/PythonBindings.')
-
class PossibleWebDriverBrowser(possible_browser.PossibleBrowser):
"""A browser that can be controlled through webdriver API."""
@@ -40,8 +30,9 @@ class PossibleWebDriverBrowser(possible_browser.PossibleBrowser):
target_os = sys.platform.lower()
super(PossibleWebDriverBrowser, self).__init__(browser_type, target_os,
finder_options, False)
- assert browser_type in ALL_BROWSER_TYPES, \
- 'Please add %s to ALL_BROWSER_TYPES' % browser_type
+ assert browser_type in FindAllBrowserTypes(), \
+ ('Please add %s to webdriver_desktop_browser_finder.FindAllBrowserTypes'
+ % browser_type)
def CreateWebDriverBackend(self, platform_backend):
raise NotImplementedError()
@@ -90,6 +81,17 @@ class PossibleDesktopIE(PossibleWebDriverBrowser):
def SelectDefaultBrowser(_):
return None
+def FindAllBrowserTypes():
+ if webdriver:
+ return [
+ 'internet-explorer',
+ 'internet-explorer-x64']
+ else:
+ logging.warning('Webdriver backend is unsupported without selenium pylib. '
+ 'For installation of selenium pylib, please refer to '
+ 'https://code.google.com/p/selenium/wiki/PythonBindings.')
+ return []
+
def FindAllAvailableBrowsers(finder_options):
"""Finds all the desktop browsers available on this machine."""
browsers = []
« no previous file with comments | « tools/telemetry/telemetry/core/backends/chrome/ios_browser_finder.py ('k') | tools/telemetry/telemetry/core/browser_finder.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698