Changeset 106894 in webkit
- Timestamp:
- Feb 6, 2012 7:11:29 PM (12 years ago)
- Location:
- trunk/LayoutTests
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r106886 r106894 1 2012-02-06 Adam Barth <abarth@webkit.org> 2 3 http/tests/security/mixedContent/insecure-image-in-main-frame.html is flaky 4 https://bugs.webkit.org/show_bug.cgi?id=77904 5 6 Reviewed by Darin Adler. 7 8 My theory is that the extra log message is caused by the preload 9 scanner requesting the image, 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-image-in-main-frame-expected.txt: 15 * http/tests/security/mixedContent/insecure-image-in-main-frame.html: 16 * http/tests/security/mixedContent/resources/frame-with-insecure-image.html: 17 * platform/chromium/test_expectations.txt: 18 1 19 2012-02-06 David Grogan <dgrogan@chromium.org> 2 20 -
trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt
r104803 r106894 1 main frame - didStartProvisionalLoadForFrame2 main frame - didFinishDocumentLoadForFrame3 main frame - didHandleOnloadEventsForFrame4 main frame - didFinishLoadForFrame5 main frame - didCommitLoadForFrame6 1 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-image.html displayed insecure content from http://127.0.0.1:8080/security/resources/compass.jpg. 7 2 8 didDisplayInsecureContent9 main frame - didFinishDocumentLoadForFrame10 main frame - didHandleOnloadEventsForFrame11 main frame - didFinishLoadForFrame12 3 This test opens a window that loads an insecure image. We should trigger a mixed content callback because the main frame in the window is HTTPS but is displaying insecure content. -
trunk/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html
r48284 r106894 5 5 layoutTestController.waitUntilDone(); 6 6 layoutTestController.dumpAsText(); 7 layoutTestController.dumpFrameLoadCallbacks();8 7 layoutTestController.setCanOpenWindows(); 9 8 layoutTestController.setCloseRemainingWindowsWhenComplete(true); … … 11 10 12 11 window.addEventListener("message", function (e) { 13 if (window.layoutTestController)14 layoutTestController.notifyDone();12 if (window.layoutTestController) 13 layoutTestController.notifyDone(); 15 14 }, false); 16 15 -
trunk/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html
r88377 r106894 1 <html> 2 <body onload="frameLoaded()"> 1 <img src="http://127.0.0.1:8080/security/resources/compass.jpg"> 3 2 <script> 4 function frameLoaded() {5 if (window.opener)6 window.opener.postMessage('done', '*');7 } 3 window.onload = function() { 4 if (window.opener) 5 window.opener.postMessage('done', '*'); 6 }; 8 7 </script> 9 <img src="http://127.0.0.1:8080/security/resources/compass.jpg">10 </body>11 </html> -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r106888 r106894 778 778 BUGWK42769 : http/tests/security/401-logout/401-logout.php = TIMEOUT 779 779 BUGDPRANKE WIN : http/tests/security/credentials-in-referer.html = PASS TIMEOUT 780 BUG_LEVIN DEBUG : http/tests/security/mixedContent/insecure-image-in-main-frame.html = PASS TEXT781 780 BUGWK70298 : http/tests/security/xssAuditor/cookie-injection.html = TEXT PASS 782 781 BUGCR24182 WIN RELEASE : http/tests/security/cross-origin-css.html = PASS TIMEOUT
Note: See TracChangeset
for help on using the changeset viewer.