http/tests/security/mixedContent/insecure-image-in-main-frame.html is flaky

https://bugs.webkit.org/show_bug.cgi?id=77904

Reviewed by Darin Adler.

My theory is that the extra log message is caused by the preload
scanner requesting the image, which might occur if the test is running
extremely slowly (as it might on a debug bot).

This patch simplifies the test in the hopes of removing the flakiness.

* http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt:
* http/tests/security/mixedContent/insecure-image-in-main-frame.html:
* http/tests/security/mixedContent/resources/frame-with-insecure-image.html:
* platform/chromium/test_expectations.txt:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@106894 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 834d8b0..a26d5e1 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2012-02-06  Adam Barth  <abarth@webkit.org>
+
+        http/tests/security/mixedContent/insecure-image-in-main-frame.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=77904
+
+        Reviewed by Darin Adler.
+
+        My theory is that the extra log message is caused by the preload
+        scanner requesting the image, which might occur if the test is running
+        extremely slowly (as it might on a debug bot).
+
+        This patch simplifies the test in the hopes of removing the flakiness.
+
+        * http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt:
+        * http/tests/security/mixedContent/insecure-image-in-main-frame.html:
+        * http/tests/security/mixedContent/resources/frame-with-insecure-image.html:
+        * platform/chromium/test_expectations.txt:
+
 2012-02-06  David Grogan  <dgrogan@chromium.org>
 
         Port some indexeddb layout tests to workers.

diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt
index 516c437..5b3f679 100644 (file)
--- a/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame-expected.txt
@@ -1,12 +1,3 @@
-main frame - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
-main frame - didCommitLoadForFrame
 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.
 
-didDisplayInsecureContent
-main frame - didFinishDocumentLoadForFrame
-main frame - didHandleOnloadEventsForFrame
-main frame - didFinishLoadForFrame
 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.

diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html b/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html
index c08bef1..68c88e0 100644 (file)
--- a/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-image-in-main-frame.html
@@ -4,14 +4,13 @@
 if (window.layoutTestController) {
     layoutTestController.waitUntilDone();
     layoutTestController.dumpAsText();
-    layoutTestController.dumpFrameLoadCallbacks();
     layoutTestController.setCanOpenWindows();
     layoutTestController.setCloseRemainingWindowsWhenComplete(true);
 }
 
 window.addEventListener("message", function (e) {
-  if (window.layoutTestController)
-      layoutTestController.notifyDone();
+    if (window.layoutTestController)
+        layoutTestController.notifyDone();
 }, false);
 
 </script>

diff --git a/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html b/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html
index dfb7b07..ce13691 100644 (file)
--- a/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html
+++ b/LayoutTests/http/tests/security/mixedContent/resources/frame-with-insecure-image.html
@@ -1,11 +1,7 @@
-<html>
-<body onload="frameLoaded()">
+<img src="http://127.0.0.1:8080/security/resources/compass.jpg">
 <script>
-function frameLoaded() {
-  if (window.opener)
-    window.opener.postMessage('done', '*');
-}
+window.onload = function() {
+    if (window.opener)
+        window.opener.postMessage('done', '*');
+};
 </script>
-<img src="http://127.0.0.1:8080/security/resources/compass.jpg">
-</body>
-</html>

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 6224c91..23ebcda 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -777,7 +777,6 @@ BUGCR20345 : http/tests/security/cross-frame-access-getOwnPropertyDescriptor.htm
 BUGCR42044 WIN : http/tests/security/xss-DENIED-mime-type-execute-as-html.html = PASS TIMEOUT
 BUGWK42769 : http/tests/security/401-logout/401-logout.php = TIMEOUT
 BUGDPRANKE WIN : http/tests/security/credentials-in-referer.html = PASS TIMEOUT
-BUG_LEVIN DEBUG : http/tests/security/mixedContent/insecure-image-in-main-frame.html = PASS TEXT
 BUGWK70298 : http/tests/security/xssAuditor/cookie-injection.html = TEXT PASS
 BUGCR24182 WIN RELEASE : http/tests/security/cross-origin-css.html = PASS TIMEOUT