Changeset 268896 in webkit

Timestamp:

Oct 22, 2020, 3:13:04 PM (6 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Use webkitcorepy's autoinstaller for chrome and gecko drivers
​https://bugs.webkit.org/show_bug.cgi?id=218059
<rdar://problem/70551255>

Rubber-stamped by Aakash Jain.

• Scripts/webkitpy/autoinstalled: Added.
• Scripts/webkitpy/autoinstalled/init.py: Added.
• Scripts/webkitpy/autoinstalled/chromedriver.py: Added.

(ChromeDriverPackage): Special listing rules for the chrome driver.

• Scripts/webkitpy/autoinstalled/geckodriver.py: Added.

(GeckoDriverPackage): Special listing rules for the GeckoDriver.

• Scripts/webkitpy/benchmark_runner/utils.py:

(get_driver_binary_path):

• Scripts/webkitpy/thirdparty/init.py:

(AutoinstallImportHook.find_module): Remove Chrome and Gecko drivers.
(AutoinstallImportHook.install_chromedriver): Deleted.
(AutoinstallImportHook.install_geckodriver): Deleted.
(get_driver_filename): Deleted.
(get_os_info): Deleted.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/autoinstalled (added)
• Scripts/webkitpy/autoinstalled/__init__.py (added)
• Scripts/webkitpy/autoinstalled/chromedriver.py (added)
• Scripts/webkitpy/autoinstalled/geckodriver.py (added)
• Scripts/webkitpy/benchmark_runner/utils.py (modified) (1 diff)
• Scripts/webkitpy/thirdparty/__init__.py (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-10-22  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Use webkitcorepy's autoinstaller for chrome and gecko drivers
+        https://bugs.webkit.org/show_bug.cgi?id=218059
+        <rdar://problem/70551255>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/autoinstalled: Added.
+        * Scripts/webkitpy/autoinstalled/__init__.py: Added.
+        * Scripts/webkitpy/autoinstalled/chromedriver.py: Added.
+        (ChromeDriverPackage): Special listing rules for the chrome driver.
+        * Scripts/webkitpy/autoinstalled/geckodriver.py: Added.
+        (GeckoDriverPackage): Special listing rules for the GeckoDriver.
+        * Scripts/webkitpy/benchmark_runner/utils.py:
+        (get_driver_binary_path):
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook.find_module): Remove Chrome and Gecko drivers.
+        (AutoinstallImportHook.install_chromedriver): Deleted.
+        (AutoinstallImportHook.install_geckodriver): Deleted.
+        (get_driver_filename): Deleted.
+        (get_os_info): Deleted.
+
 2020-10-22  Aakash Jain  <aakash_jain@apple.com>
 

trunk/Tools/Scripts/webkitpy/benchmark_runner/utils.py

@@ -53 +53 @@
 def get_driver_binary_path(browser_name):
     if browser_name.startswith('chrome'):
-        import webkitpy.thirdparty.autoinstalled.chromedriver
-        driver_init_file = webkitpy.thirdparty.autoinstalled.chromedriver.__file__
-        driver_executable = os.path.join(os.path.dirname(os.path.realpath(driver_init_file)), 'chromedriver')
-        return driver_executable
+        from webkitpy.autoinstalled import chromedriver
+        return chromedriver.executable
     elif browser_name.startswith('firefox'):
-        import webkitpy.thirdparty.autoinstalled.geckodriver
-        driver_init_file = webkitpy.thirdparty.autoinstalled.geckodriver.__file__
-        driver_executable = os.path.join(os.path.dirname(os.path.realpath(driver_init_file)), 'geckodriver')
-        return driver_executable
+        from webkitpy.autoinstalled import geckodriver
+        return geckodriver.executable
 
 

trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py

@@ -34 +34 @@
 
 if sys.version_info > (3, 0):
-    from urllib.error import URLError
     from urllib.request import urlopen
 else:
-    from urllib2 import URLError, urlopen
+    from urllib2 import urlopen
 
-from collections import namedtuple
-from distutils import spawn
 from webkitpy.common.system.autoinstall import AutoInstaller
 from webkitpy.common.system.filesystem import FileSystem
@@ -47 +44 @@
 _THIRDPARTY_DIR = os.path.dirname(__file__)
 _AUTOINSTALLED_DIR = os.path.join(_THIRDPARTY_DIR, "autoinstalled")
-
-CHROME_DRIVER_URL = "http://chromedriver.storage.googleapis.com/"
-FIREFOX_RELEASES_URL = "https://api.github.com/repos/mozilla/geckodriver/releases"
 
 # Putting the autoinstall code into webkitpy/thirdparty/__init__.py
@@ -98 +92 @@
         elif '.twisted_15_5_0' in fullname:
             self._install_twisted_15_5_0()
-        elif '.chromedriver' in fullname:
-            self.install_chromedriver()
-        elif '.geckodriver' in fullname:
-            self.install_geckodriver()
 
     # autoinstalled.buildbot is used by BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py
@@ -142 +132 @@
         return True
 
-    def install_chromedriver(self):
-        filename_postfix = get_driver_filename().chrome
-        if filename_postfix != "unsupported":
-            version = urlopen(CHROME_DRIVER_URL + 'LATEST_RELEASE').read().strip()
-            full_chrome_url = "{base_url}{version}/chromedriver_{os}.zip".format(base_url=CHROME_DRIVER_URL, version=version, os=filename_postfix)
-            self.install_binary(full_chrome_url, 'chromedriver')
-
-    def install_geckodriver(self):
-        filename_postfix = get_driver_filename().firefox
-        if filename_postfix != "unsupported":
-            firefox_releases_blob = urlopen(FIREFOX_RELEASES_URL)
-            firefox_releases_line_separated = json.dumps(json.load(firefox_releases_blob), indent=0).strip()
-            all_firefox_release_urls = "\n".join(re.findall(r'.*browser_download_url.*', firefox_releases_line_separated))
-            full_firefox_url = re.findall(r'.*%s.*' % filename_postfix, all_firefox_release_urls)[0].split('"')[3]
-            self.install_binary(full_firefox_url, 'geckodriver')
-
     def _install(self, url, url_subpath=None, target_name=None):
         installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)
@@ -185 +159 @@
     for method in install_methods:
         getattr(_hook, method)()
-
-def get_driver_filename():
-    os_name, os_type = get_os_info()
-    chrome_os, filefox_os = 'unsupported', 'unsupported'
-    if os_name == 'Linux' and os_type == '64':
-        chrome_os, firefox_os = 'linux64', 'linux64'
-    elif os_name == 'Linux':
-        chrome_os, firefox_os = 'linux32', 'linux32'
-    elif os_name == 'Darwin':
-        chrome_os, firefox_os = 'mac64', 'macos'
-    DriverFilenameForBrowser = namedtuple('DriverFilenameForBrowser', ['chrome', 'firefox'])
-    return DriverFilenameForBrowser(chrome_os, firefox_os)
-
-def get_os_info():
-    import platform
-    os_name = platform.system()
-    os_type = platform.machine()[-2:]
-    return (os_name, os_type)