Title: [106774] trunk/LayoutTests
Revision
106774
Author
[email protected]
Date
2012-02-05 21:55:10 -0800 (Sun, 05 Feb 2012)

Log Message

xss-DENIED-from-data-url-in-foreign-domain-subframe.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=77849

Reviewed by Kentaro Hara.

This test doesn't seem to be sequenced correctly w.r.t. the load events
of the various frames involved.  This patch re-orders some of the
triggers in the hopes of making the test no longer flaky.

* http/tests/security/dataURL/resources/foreign-domain-data-url-accessor-iframe.html:
* http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt:
* http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html:
* platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt:
* platform/chromium/test_expectations.txt:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (106773 => 106774)


--- trunk/LayoutTests/ChangeLog	2012-02-06 04:47:11 UTC (rev 106773)
+++ trunk/LayoutTests/ChangeLog	2012-02-06 05:55:10 UTC (rev 106774)
@@ -1,3 +1,20 @@
+2012-02-05  Adam Barth  <[email protected]>
+
+        xss-DENIED-from-data-url-in-foreign-domain-subframe.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=77849
+
+        Reviewed by Kentaro Hara.
+
+        This test doesn't seem to be sequenced correctly w.r.t. the load events
+        of the various frames involved.  This patch re-orders some of the
+        triggers in the hopes of making the test no longer flaky.
+
+        * http/tests/security/dataURL/resources/foreign-domain-data-url-accessor-iframe.html:
+        * http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt:
+        * http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html:
+        * platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt:
+        * platform/chromium/test_expectations.txt:
+
 2012-02-05  Abhishek Arya  <[email protected]>
 
         Crash in FormSubmission::create.

Modified: trunk/LayoutTests/http/tests/security/dataURL/resources/foreign-domain-data-url-accessor-iframe.html (106773 => 106774)


--- trunk/LayoutTests/http/tests/security/dataURL/resources/foreign-domain-data-url-accessor-iframe.html	2012-02-06 04:47:11 UTC (rev 106773)
+++ trunk/LayoutTests/http/tests/security/dataURL/resources/foreign-domain-data-url-accessor-iframe.html	2012-02-06 05:55:10 UTC (rev 106774)
@@ -1,8 +1,9 @@
 <html>
 <body>
-    <p>Inner iframe on a foreign domain.</p>
-    <iframe id="aFrame"></iframe>
-    <script>
+<p>Inner iframe on a foreign domain.</p>
+<iframe id="aFrame"></iframe>
+<script>
+    window._onload_ = function() {
         var url = ""
             + "<head>"
             +     "<scr" + "ipt>"
@@ -27,6 +28,7 @@
 
         var frame = document.getElementById('aFrame');
         frame.src = ""
-    </script>
+    };
+</script>
 </body>
 </html>

Modified: trunk/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt (106773 => 106774)


--- trunk/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt	2012-02-06 04:47:11 UTC (rev 106773)
+++ trunk/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt	2012-02-06 05:55:10 UTC (rev 106774)
@@ -3,9 +3,10 @@
 ALERT: PASS: Exception thrown successfully.
 The scenario for this test is that you have an iframe with content from a foreign domain. In that foreign content is an iframe which loads a data: URL. This tests that the data: URL loaded iframe does not have access to the main frame using top.document.
 
-
 Pass: Cross frame access from a data: URL on a different domain was denied.
 
+
+
 --------
 Frame: 'aFrame'
 --------

Modified: trunk/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html (106773 => 106774)


--- trunk/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html	2012-02-06 04:47:11 UTC (rev 106773)
+++ trunk/LayoutTests/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html	2012-02-06 05:55:10 UTC (rev 106774)
@@ -1,21 +1,18 @@
 <html>
 <head>
-    <script>
-        window._onload_ = function()
-        {
-            if (window.layoutTestController) {
-                layoutTestController.dumpAsText();
-                layoutTestController.dumpChildFramesAsText();
-                layoutTestController.waitUntilDone();
-            }
-        }
-    </script>
+<script>
+if (window.layoutTestController) {
+    layoutTestController.dumpAsText();
+    layoutTestController.dumpChildFramesAsText();
+    layoutTestController.waitUntilDone();
+}
+</script>
 </head>
 <body>
     <p>The scenario for this test is that you have an iframe with content from a foreign domain.  In that foreign content
         is an iframe which loads a data: URL.  This tests that the data: URL loaded iframe does not have access
         to the main frame using top.document.</p>
-    <iframe id='aFrame' src="" style="width: 400px; height:200px;"></iframe>
     <p id='accessMe'>Pass: Cross frame access from a data: URL on a different domain was denied.</p>
+    <iframe id='aFrame' src="" style="width: 400px; height:200px;"></iframe>
 </body>
 </html>

Modified: trunk/LayoutTests/platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt (106773 => 106774)


--- trunk/LayoutTests/platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt	2012-02-06 04:47:11 UTC (rev 106773)
+++ trunk/LayoutTests/platform/chromium/http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe-expected.txt	2012-02-06 05:55:10 UTC (rev 106774)
@@ -3,9 +3,10 @@
 ALERT: PASS: Exception thrown successfully.
 The scenario for this test is that you have an iframe with content from a foreign domain. In that foreign content is an iframe which loads a data: URL. This tests that the data: URL loaded iframe does not have access to the main frame using top.document.
 
-
 Pass: Cross frame access from a data: URL on a different domain was denied.
 
+
+
 --------
 Frame: 'aFrame'
 --------

Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (106773 => 106774)


--- trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-02-06 04:47:11 UTC (rev 106773)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt	2012-02-06 05:55:10 UTC (rev 106774)
@@ -772,7 +772,6 @@
 // Flaky: fails about 5% of the time.
 BUGCR31342 WIN RELEASE : security/block-test-no-port.html = PASS TEXT
 
-BUGCR9798 RELEASE : http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html = PASS TIMEOUT
 BUGCR26042 : http/tests/security/mixedContent/insecure-plugin-in-iframe.html = PASS TEXT
 BUGWK65567 DEBUG : http/tests/security/mixedContent/insecure-script-in-iframe.html = PASS TEXT
 BUGCR20345 : http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT
@@ -785,6 +784,9 @@
 BUGWK70298 : http/tests/security/xssAuditor/cookie-injection.html = TEXT PASS
 BUGCR24182 WIN RELEASE : http/tests/security/cross-origin-css.html = PASS TIMEOUT
 
+// Hopefully fixed flakiness (need to verify with dashboard).
+BUGCR9798 RELEASE : http/tests/security/dataURL/xss-DENIED-from-data-url-in-foreign-domain-subframe.html = PASS TIMEOUT
+
 // -----------------------------------------------------------------
 // Plugin tests
 // -----------------------------------------------------------------
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to