Title: [185430] trunk/LayoutTests
- Revision
- 185430
- Author
- achristen...@apple.com
- Date
- 2015-06-10 14:30:23 -0700 (Wed, 10 Jun 2015)
Log Message
Move all content extension tests to same directory to fix flakiness.
https://bugs.webkit.org/show_bug.cgi?id=145854
Reviewed by Alexey Proskuryakov.
* http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt: Removed.
* http/tests/contentextensions/loading/main-resource-redirect-blocked.php: Removed.
* http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json: Removed.
* http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html: Removed.
* http/tests/contentextensions/main-resource-redirect-blocked-expected.txt: Copied from http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt.
* http/tests/contentextensions/main-resource-redirect-blocked.php: Copied from http/tests/contentextensions/loading/main-resource-redirect-blocked.php.
* http/tests/contentextensions/main-resource-redirect-blocked.php.json: Copied from http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json.
* http/tests/contentextensions/resources/main-resource-redirect-blocked-target.html: Copied from http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html.
Modified Paths
Added Paths
Removed Paths
- trunk/LayoutTests/http/tests/contentextensions/loading/
Diff
Modified: trunk/LayoutTests/ChangeLog (185429 => 185430)
--- trunk/LayoutTests/ChangeLog 2015-06-10 20:50:48 UTC (rev 185429)
+++ trunk/LayoutTests/ChangeLog 2015-06-10 21:30:23 UTC (rev 185430)
@@ -1,3 +1,19 @@
+2015-06-10 Alex Christensen <achristen...@webkit.org>
+
+ Move all content extension tests to same directory to fix flakiness.
+ https://bugs.webkit.org/show_bug.cgi?id=145854
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt: Removed.
+ * http/tests/contentextensions/loading/main-resource-redirect-blocked.php: Removed.
+ * http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json: Removed.
+ * http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html: Removed.
+ * http/tests/contentextensions/main-resource-redirect-blocked-expected.txt: Copied from http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt.
+ * http/tests/contentextensions/main-resource-redirect-blocked.php: Copied from http/tests/contentextensions/loading/main-resource-redirect-blocked.php.
+ * http/tests/contentextensions/main-resource-redirect-blocked.php.json: Copied from http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json.
+ * http/tests/contentextensions/resources/main-resource-redirect-blocked-target.html: Copied from http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html.
+
2015-06-10 Gyuyoung Kim <gyuyoung....@webkit.org>
[EFL] Unreviewed, EFL gardening on Jun 10th
Copied: trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt (from rev 185425, trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked-expected.txt) (0 => 185430)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked-expected.txt 2015-06-10 21:30:23 UTC (rev 185430)
@@ -0,0 +1,3 @@
+main frame - didStartProvisionalLoadForFrame
+main frame - didFailProvisionalLoadWithError
+main frame - (kWKErrorCodeCannotShowURL)
Copied: trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked.php (from rev 185425, trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php) (0 => 185430)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked.php (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked.php 2015-06-10 21:30:23 UTC (rev 185430)
@@ -0,0 +1,4 @@
+<?php
+ header('Location: resources/main-resource-redirect-blocked-target.html');
+ header('HTTP/1.0 302 Found');
+?>
Copied: trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked.php.json (from rev 185425, trunk/LayoutTests/http/tests/contentextensions/loading/main-resource-redirect-blocked.php.json) (0 => 185430)
--- trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked.php.json (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/main-resource-redirect-blocked.php.json 2015-06-10 21:30:23 UTC (rev 185430)
@@ -0,0 +1,10 @@
+[
+ {
+ "action": {
+ "type": "block"
+ },
+ "trigger": {
+ "url-filter": ".*main-resource-redirect-blocked-target.html"
+ }
+ }
+]
Copied: trunk/LayoutTests/http/tests/contentextensions/resources/main-resource-redirect-blocked-target.html (from rev 185425, trunk/LayoutTests/http/tests/contentextensions/loading/resources/main-resource-redirect-blocked-target.html) (0 => 185430)
--- trunk/LayoutTests/http/tests/contentextensions/resources/main-resource-redirect-blocked-target.html (rev 0)
+++ trunk/LayoutTests/http/tests/contentextensions/resources/main-resource-redirect-blocked-target.html 2015-06-10 21:30:23 UTC (rev 185430)
@@ -0,0 +1 @@
+This page should never actually load.
\ No newline at end of file
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
