Title: [258859] trunk/LayoutTests
- Revision
- 258859
- Author
- [email protected]
- Date
- 2020-03-23 11:01:52 -0700 (Mon, 23 Mar 2020)
Log Message
Fixing merge conflict
Unreviewed test gardening.
* platform/ios-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (258858 => 258859)
--- trunk/LayoutTests/ChangeLog 2020-03-23 17:50:08 UTC (rev 258858)
+++ trunk/LayoutTests/ChangeLog 2020-03-23 18:01:52 UTC (rev 258859)
@@ -1,3 +1,11 @@
+2020-03-23 Jacob Uphoff <[email protected]>
+
+ Fixing merge conflict
+
+ Unreviewed test gardening.
+
+ * platform/ios-wk2/TestExpectations:
+
2020-03-23 Antoine Quint <[email protected]>
[Win] http/wpt/css/css-animations/start-animation-001.html is failing on Windows EWS
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (258858 => 258859)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2020-03-23 17:50:08 UTC (rev 258858)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2020-03-23 18:01:52 UTC (rev 258859)
@@ -1638,10 +1638,8 @@
webkit.org/b/209295 imported/w3c/web-platform-tests/service-workers/service-worker/respond-with-body-accessed-response.https.html [ Pass Failure ]
-<<<<<<< HEAD
webkit.org/b/209350 css2.1/20110323/replaced-intrinsic-ratio-001.htm [ Pass Failure ]
-=======
+
webkit.org/b/209352 http/tests/security/stylesheet-href-redirect.html [ Pass Timeout ]
->>>>>>> [ iOS ] http/tests/security/stylesheet-href-redirect.html is flaky timing out
webkit.org/b/209357 http/tests/resourceLoadStatistics/third-party-cookie-blocking-on-sites-without-user-interaction-database.html [ Pass Timeout ]
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
