Fix autoinstaller failing on autoinstall_everything

https://bugs.webkit.org/show_bug.cgi?id=174830

Patch by Matthew Stewart <matthew_r_stewart@apple.com> on 2017-07-25
Reviewed by Joseph Pecoraro.

* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook.find_module):
(AutoinstallImportHook.install_chromedriver):
(AutoinstallImportHook.install_geckodriver):
(AutoinstallImportHook._install_chromedriver): Deleted.
(AutoinstallImportHook._install_geckodriver): Deleted.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@219882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index abee97f48249af5d9ebd8da5ee26b2e1f70d487b..227395e55b304db75c005baba54d905605a3f715 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2017-07-25  Matthew Stewart  <matthew_r_stewart@apple.com>
+
+        Fix autoinstaller failing on autoinstall_everything
+        https://bugs.webkit.org/show_bug.cgi?id=174830
+
+        Reviewed by Joseph Pecoraro.
+
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook.find_module):
+        (AutoinstallImportHook.install_chromedriver):
+        (AutoinstallImportHook.install_geckodriver):
+        (AutoinstallImportHook._install_chromedriver): Deleted.
+        (AutoinstallImportHook._install_geckodriver): Deleted.
+
 2017-07-25  Jonathan Bedard  <jbedard@apple.com>
 
         Replace --runtime with something for both ios-simulator and ios-device

diff --git a/Tools/Scripts/webkitpy/thirdparty/__init__.py b/Tools/Scripts/webkitpy/thirdparty/__init__.py
index 425b0fb4c4bca145da8cd6a19ba82a66274d29c3..c084a17cb984832350cc9284c7c675ac90b01a6b 100644 (file)
--- a/Tools/Scripts/webkitpy/thirdparty/__init__.py
+++ b/Tools/Scripts/webkitpy/thirdparty/__init__.py
@@ -103,9 +103,9 @@ class AutoinstallImportHook(object):
         elif '.selenium' in fullname:
             self._install_selenium()
         elif '.chromedriver' in fullname:
-            self._install_chromedriver()
+            self.install_chromedriver()
         elif '.geckodriver' in fullname:
-            self._install_geckodriver()
+            self.install_geckodriver()
 
     def _install_mechanize(self):
         self._install("http://pypi.python.org/packages/source/m/mechanize/mechanize-0.2.5.tar.gz",
@@ -171,14 +171,14 @@ class AutoinstallImportHook(object):
         url, url_subpath = self.get_latest_pypi_url('selenium')
         self._install(url=url, url_subpath=url_subpath)
 
-    def _install_chromedriver(self):
+    def install_chromedriver(self):
         filename_postfix = get_driver_filename().chrome
         if filename_postfix != "unsupported":
             version = urllib2.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):
+    def install_geckodriver(self):
         filename_postfix = get_driver_filename().firefox
         if filename_postfix != "unsupported":
             firefox_releases_blob = urllib2.urlopen(FIREFOX_RELEASES_URL)