Title: [267478] trunk/Tools
Revision
267478
Author
[email protected]
Date
2020-09-23 08:57:11 -0700 (Wed, 23 Sep 2020)

Log Message

REGRESSION(r267368) [webkitpy] autoinstalled pytest raises ImportError in run-webdriver-tests
https://bugs.webkit.org/show_bug.cgi?id=216879

Reviewed by Jonathan Bedard.

Autoinstalled pytest requires sys.path to be updated with the newly
installed packages. Before r267368 it worked because
webdriver_w3c_executor.py autoinstalled mozlog/mozprocess which
updated the sys.path.

* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook._install_pytest):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (267477 => 267478)


--- trunk/Tools/ChangeLog	2020-09-23 15:53:01 UTC (rev 267477)
+++ trunk/Tools/ChangeLog	2020-09-23 15:57:11 UTC (rev 267478)
@@ -1,3 +1,18 @@
+2020-09-23  Lauro Moura  <[email protected]>
+
+        REGRESSION(r267368) [webkitpy] autoinstalled pytest raises ImportError in run-webdriver-tests
+        https://bugs.webkit.org/show_bug.cgi?id=216879
+
+        Reviewed by Jonathan Bedard.
+
+        Autoinstalled pytest requires sys.path to be updated with the newly
+        installed packages. Before r267368 it worked because
+        webdriver_w3c_executor.py autoinstalled mozlog/mozprocess which
+        updated the sys.path.
+
+        * Scripts/webkitpy/thirdparty/__init__.py:
+        (AutoinstallImportHook._install_pytest):
+
 2020-09-23  Youenn Fablet  <[email protected]>
 
         Add support for HTMLMediaElement.setSinkId

Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (267477 => 267478)


--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py	2020-09-23 15:53:01 UTC (rev 267477)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py	2020-09-23 15:57:11 UTC (rev 267478)
@@ -144,6 +144,7 @@
                               "pytest-timeout-1.2.0/pytest_timeout.py")
 
     def _install_pytest(self):
+        self._ensure_autoinstalled_dir_is_in_sys_path()
         self._install("https://files.pythonhosted.org/packages/90/e3/e075127d39d35f09a500ebb4a90afd10f9ef0a1d28a6d09abeec0e444fdd/py-1.5.2.tar.gz",
                               "py-1.5.2/py")
         self._install("https://files.pythonhosted.org/packages/11/bf/cbeb8cdfaffa9f2ea154a30ae31a9d04a1209312e2919138b4171a1f8199/pluggy-0.6.0.tar.gz",
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to