Title: [187661] branches/safari-601.1-branch/LayoutTests
Revision
187661
Author
[email protected]
Date
2015-07-31 11:10:17 -0700 (Fri, 31 Jul 2015)

Log Message

Merged r187523.  rdar://problem/22010303

Modified Paths

Diff

Modified: branches/safari-601.1-branch/LayoutTests/ChangeLog (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/ChangeLog	2015-07-31 18:10:17 UTC (rev 187661)
@@ -1,5 +1,48 @@
 2015-07-31  Lucas Forschler  <[email protected]>
 
+        Merge r187523
+
+    2015-07-28  Chris Dumez  <[email protected]>
+
+            Tests introduced in r187489 are flaky
+            https://bugs.webkit.org/show_bug.cgi?id=147327
+
+            Rubber-stamped by Benjamin Poulain.
+
+            Tests introduced in r187489 are flaky, they sometimes print the console
+            message, sometimes not. The reason is that we sometimes use a cached
+            parsed stylesheet and we do not print the warning in this case. To fix
+            the flakiness, we now clear the memory cache at the beginning of each
+            test to make sure we download and parse the stylesheets.
+
+            * http/tests/security/cross-origin-css-1.html:
+            * http/tests/security/cross-origin-css-2.html:
+            * http/tests/security/cross-origin-css-3.html:
+            * http/tests/security/cross-origin-css-4.html:
+            * http/tests/security/cross-origin-css-5.html:
+            * http/tests/security/cross-origin-css-6.html:
+            * http/tests/security/cross-origin-css-7.html:
+            * http/tests/security/cross-origin-css-8.html:
+            * http/tests/security/cross-origin-css-in-quirks-1.html:
+            * http/tests/security/cross-origin-css-in-quirks-2.html:
+            * http/tests/security/cross-origin-css-in-quirks-3.html:
+            * http/tests/security/cross-origin-css-in-quirks-4.html:
+            * http/tests/security/cross-origin-css-in-quirks-5.html:
+            * http/tests/security/cross-origin-css-in-quirks-6.html:
+            * http/tests/security/cross-origin-css-in-quirks-7.html:
+            * http/tests/security/cross-origin-css-in-quirks-8.html:
+            * http/tests/security/same-origin-css-1.html:
+            * http/tests/security/same-origin-css-2.html:
+            * http/tests/security/same-origin-css-3.html:
+            * http/tests/security/same-origin-css-4.html:
+            * http/tests/security/same-origin-css-5.html:
+            * http/tests/security/same-origin-css-6.html:
+            * http/tests/security/same-origin-css-7.html:
+            * http/tests/security/same-origin-css-8.html:
+            * http/tests/security/same-origin-css-in-quirks.html:
+
+2015-07-31  Lucas Forschler  <[email protected]>
+
         Merge r187512
 
     2015-07-28  Chris Dumez  <[email protected]>

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-1.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-1.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-1.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-2.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-2.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-2.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-3.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-3.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-3.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-4.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-4.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-4.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-5.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-5.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-5.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-6.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-6.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-6.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-7.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-7.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-7.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-8.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-8.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-8.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-1.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-2.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-3.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-4.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-5.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-5.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-5.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-6.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-6.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-6.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-7.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-7.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-7.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-8.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-8.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/cross-origin-css-in-quirks-8.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Cross-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-1.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-1.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-1.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-2.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-2.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-2.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-3.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-3.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-3.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-4.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-4.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-4.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -2,7 +2,11 @@
 <html>
 <head>
 <title>Same-origin CSS</title>
-
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-5.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-5.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-5.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-6.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-6.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-6.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-7.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-7.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-7.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-8.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-8.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-8.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -3,6 +3,11 @@
 <head>
 <title>Same-origin CSS</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 

Modified: branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-in-quirks.html (187660 => 187661)


--- branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-in-quirks.html	2015-07-31 18:08:28 UTC (rev 187660)
+++ branches/safari-601.1-branch/LayoutTests/http/tests/security/same-origin-css-in-quirks.html	2015-07-31 18:10:17 UTC (rev 187661)
@@ -6,6 +6,11 @@
 <head>
 <title>Same-origin CSS in quirks mode</title>
 
+<script>
+// Prune memory cache to make sure we don't use a cached parsed stylesheet, in which case
+// the console warning would not be shown and the test would be flaky.
+internals.pruneMemoryCacheToSize(0);
+</script>
 <script src=""
 <script src=""
 
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to