Changeset 277315 in webkit

Timestamp:

May 10, 2021, 7:14:57 PM (5 years ago)

Author:

Chris Dumez

Message:

[ macOS Release wk2 ] http/tests/cache-storage/cache-records-persistency.https.html is flaky crashing
​https://bugs.webkit.org/show_bug.cgi?id=225522
<rdar://problem/77680019>

Reviewed by Darin Adler.

Source/WTF:

Pass ec parameter to std::filesystem::directory_iterator() so that it doesn't throw in case of the
path does not exist. Normally, the function would return early earlier if the path does not exist
or isn't a directory. However, in the context of the test, this function is getting called on a
background thread and another thread is deleting the directory in parallel.

• wtf/FileSystem.cpp:

(WTF::FileSystemImpl::deleteEmptyDirectory):

LayoutTests:

Restore previous expectation for the test, now that it is no longer flaky crashing.

• platform/mac-wk2/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WTF/ChangeLog (modified) (1 diff)
• Source/WTF/wtf/FileSystem.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-05-10  Chris Dumez  <cdumez@apple.com>
+
+        [ macOS Release wk2 ] http/tests/cache-storage/cache-records-persistency.https.html is flaky crashing
+        https://bugs.webkit.org/show_bug.cgi?id=225522
+        <rdar://problem/77680019>
+
+        Reviewed by Darin Adler.
+
+        Restore previous expectation for the test, now that it is no longer flaky crashing.
+
+        * platform/mac-wk2/TestExpectations:
+
 2021-05-10  Chris Gambrell  <cgambrell@apple.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -1391 +1391 @@
 webkit.org/b/224784 [ BigSur Release arm64 ] imported/w3c/web-platform-tests/navigation-timing/test_performance_attributes.sub.html [ Pass Failure ]
 
-webkit.org/b/225522 [ Release ] http/tests/cache-storage/cache-records-persistency.https.html [ Pass Failure Crash ]
+webkit.org/b/207474 http/tests/cache-storage/cache-records-persistency.https.html [ Pass Failure ]
 
 webkit.org/b/225529 [ BigSur Release arm64 ] scrollingcoordinator/mac/fixed-backgrounds/fixed-background-in-overflow-in-iframe.html [ Pass Failure ]

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-05-10  Chris Dumez  <cdumez@apple.com>
+
+        [ macOS Release wk2 ] http/tests/cache-storage/cache-records-persistency.https.html is flaky crashing
+        https://bugs.webkit.org/show_bug.cgi?id=225522
+        <rdar://problem/77680019>
+
+        Reviewed by Darin Adler.
+
+        Pass ec parameter to std::filesystem::directory_iterator() so that it doesn't throw in case of the
+        path does not exist. Normally, the function would return early earlier if the path does not exist
+        or isn't a directory. However, in the context of the test, this function is getting called on a
+        background thread and another thread is deleting the directory in parallel.
+
+        * wtf/FileSystem.cpp:
+        (WTF::FileSystemImpl::deleteEmptyDirectory):
+
 2021-05-10  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WTF/wtf/FileSystem.cpp

@@ -563 +563 @@
 #if PLATFORM(MAC)
     bool containsSingleDSStoreFile = false;
-    for (auto& entry : std::filesystem::directory_iterator(fsPath)) {
+    for (auto& entry : std::filesystem::directory_iterator(fsPath, ec)) {
         if (entry.path().filename() == ".DS_Store")
             containsSingleDSStoreFile = true;