Changeset 106896 in webkit
- Timestamp:
- Feb 6, 2012, 7:52:01 PM (15 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 5 edited
-
ChangeLog (modified) (1 diff)
-
http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt (modified) (1 diff)
-
http/tests/security/mixedContent/insecure-script-in-iframe.html (modified) (1 diff)
-
http/tests/security/mixedContent/resources/frame-with-insecure-script.html (modified) (1 diff)
-
platform/chromium/test_expectations.txt (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r106894 r106896 1 2012-02-06 Adam Barth <abarth@webkit.org> 2 3 http/tests/security/mixedContent/insecure-script-in-iframe.html flaky in chromium debug 4 https://bugs.webkit.org/show_bug.cgi?id=65567 5 6 Reviewed by Eric Seidel. 7 8 My theory is that the extra log message is caused by the preload 9 scanner requesting the script, which might occur if the test is running 10 extremely slowly (as it might on a debug bot). 11 12 This patch simplifies the test in the hopes of removing the flakiness. 13 14 * http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt: 15 * http/tests/security/mixedContent/insecure-script-in-iframe.html: 16 * http/tests/security/mixedContent/resources/frame-with-insecure-script.html: 17 * platform/chromium/test_expectations.txt: 18 1 19 2012-02-06 Adam Barth <abarth@webkit.org> 2 20 -
trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe-expected.txt
r104803 r106896 1 frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame2 main frame - didFinishDocumentLoadForFrame3 frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame4 1 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html ran insecure content from http://127.0.0.1:8080/security/mixedContent/resources/script.js. 5 2 6 didRunInsecureContent7 frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame8 frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame9 main frame - didHandleOnloadEventsForFrame10 frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame11 main frame - didFinishLoadForFrame12 3 This test loads a secure iframe that loads an insecure script. We should trigger a mixed content callback even though the main frame is HTTP because the HTTPS frame's origin is contaminated with an insecure script. 13 4 -
trunk/LayoutTests/http/tests/security/mixedContent/insecure-script-in-iframe.html
r48284 r106896 2 2 <body> 3 3 <script> 4 if (window.layoutTestController) {4 if (window.layoutTestController) 5 5 layoutTestController.dumpAsText(); 6 layoutTestController.dumpFrameLoadCallbacks();7 }8 6 </script> 9 7 <p>This test loads a secure iframe that loads an insecure script. We should 10 8 trigger a mixed content callback even though the main frame is HTTP because the 11 9 HTTPS frame's origin is contaminated with an insecure script.</p> 12 <iframe src="https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html"; 13 ></iframe> 10 <iframe src="https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-script.html"></iframe> 14 11 </body> 15 12 </html> -
trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-script.html
r88377 r106896 1 < body onload="frameLoaded()">1 <script src="http://127.0.0.1:8080/security/mixedContent/resources/script.js"></script> 2 2 <script> 3 function frameLoaded() {4 if (window.opener)5 window.opener.postMessage('done', '*');6 } 3 window.onload = function() { 4 if (window.opener) 5 window.opener.postMessage('done', '*'); 6 }; 7 7 </script> 8 <script src="http://127.0.0.1:8080/security/mixedContent/resources/script.js"></script>9 </body> -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r106894 r106896 773 773 BUGCR31342 WIN RELEASE : security/block-test-no-port.html = PASS TEXT 774 774 775 BUGWK65567 DEBUG : http/tests/security/mixedContent/insecure-script-in-iframe.html = PASS TEXT776 775 BUGCR20345 : http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT 777 776 BUGCR42044 WIN : http/tests/security/xss-DENIED-mime-type-execute-as-html.html = PASS TIMEOUT
Note:
See TracChangeset
for help on using the changeset viewer.