Title: [280143] trunk/LayoutTests
Revision
280143
Author
[email protected]
Date
2021-07-21 09:49:05 -0700 (Wed, 21 Jul 2021)

Log Message

Revert "Added test expectations to ios-wk2."

This reverts commit 280142.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (280142 => 280143)


--- trunk/LayoutTests/ChangeLog	2021-07-21 16:37:19 UTC (rev 280142)
+++ trunk/LayoutTests/ChangeLog	2021-07-21 16:49:05 UTC (rev 280143)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 2021-07-21  Rob Buis  <[email protected]>
 
         [AspectRatio] Fix select-element-001.html
@@ -9,19 +8,7 @@
         Now select-element-001.html passes.
 
         * TestExpectations:
-=======
-2021-07-21  Ayumi Kojima  <[email protected]>
 
-        [ BigSur Release wk2 arm64 & iOS] http/tests/appcache/fail-on-update-2.html (layout-test) is a flaky timeout.
-        https://bugs.webkit.org/show_bug.cgi?id=225665
-
-        Added test expectations to ios-wk2.
-
-        Unreviewed test gardening.
-
-        * platform/ios-wk2/TestExpectations:
->>>>>>> 29b8edb52062 (Added test expectations to ios-wk2.)
-
 2021-07-20  Ayumi Kojima  <[email protected]>
 
         [iOS] http/tests/appcache/fail-on-update.html is a flaky timeout

Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (280142 => 280143)


--- trunk/LayoutTests/platform/ios-wk2/TestExpectations	2021-07-21 16:37:19 UTC (rev 280142)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations	2021-07-21 16:49:05 UTC (rev 280143)
@@ -1061,8 +1061,6 @@
 
 webkit.org/b/227891 http/tests/appcache/fail-on-update.html [ DumpJSConsoleLogInStdErr Slow ]
 
-webkit.org/b/225665 http/tests/appcache/fail-on-update-2.html [ DumpJSConsoleLogInStdErr Slow ]
-
 webkit.org/b/153050 http/tests/security/cross-frame-access-custom.html [ Pass Failure ]
 
 webkit.org/b/155201 storage/domstorage/events/basic-body-attribute.html [ Pass Failure ]
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to