Changeset 271443 in webkit

Timestamp:

Jan 13, 2021, 10:51:01 AM (6 years ago)

Author:

commit-queue@webkit.org

Message:

Avoid over-aggressive clearing of *.pyc files running webkitpy tests
​https://bugs.webkit.org/show_bug.cgi?id=220594

Patch by Sam Sneddon <Sam Sneddon> on 2021-01-13
Reviewed by Darin Adler.

• Scripts/webkitpy/test/finder.py:

(source_from_cache): Added fallback for PY2
(_DirectoryTree.clean): Change to use imported/fallback source_from_cache

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/test/finder.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-01-13  Sam Sneddon  <gsnedders@apple.com>
+
+        Avoid over-aggressive clearing of *.pyc files running webkitpy tests
+        https://bugs.webkit.org/show_bug.cgi?id=220594
+
+        Reviewed by Darin Adler.
+
+        * Scripts/webkitpy/test/finder.py:
+        (source_from_cache): Added fallback for PY2
+        (_DirectoryTree.clean): Change to use imported/fallback source_from_cache
+
 2021-01-13  Diego Pino Garcia  <dpino@igalia.com>
 

trunk/Tools/Scripts/webkitpy/test/finder.py

@@ -26 +26 @@
 import logging
 import re
+
+try:
+    from importlib.util import source_from_cache
+except ImportError:  # Python 2
+    def source_from_cache(path):
+        return path[:-1]
 
 
@@ -68 +74 @@
         filenames = self.filesystem.files_under(self.search_directory)
         for filename in filenames:
-            if filename.endswith(".pyc") and filename[:-1] not in filenames:
-                _log.info("Deleting orphan *.pyc file: %s" % filename)
-                self.filesystem.remove(filename)
+            if filename.endswith(".pyc"):
+                try:
+                    orphan = source_from_cache(filename) not in filenames
+                except ValueError:
+                    orphan = True
+                if orphan:
+                    _log.info("Deleting orphan *.pyc file: %s" % filename)
+                    self.filesystem.remove(filename)