projects / profile / ivi / webkit-efl.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ee0a32f)
http/tests/security/mixedContent/insecure-plugin-in-iframe.html is flaky
authorabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Feb 2012 22:32:52 +0000 (22:32 +0000)
committerabarth@webkit.org <abarth@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 6 Feb 2012 22:32:52 +0000 (22:32 +0000)
https://bugs.webkit.org/show_bug.cgi?id=77901

Reviewed by Eric Seidel.

This test fails occationally because of the order of the frame load
callbacks.  Now that we log mixed content errors to the console, we
don't need to dump the frame load callbacks in this test.

* http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt:
* http/tests/security/mixedContent/insecure-plugin-in-iframe.html:

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

LayoutTests/ChangeLog patch | blob | history
LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt patch | blob | history
LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html patch | blob | history
LayoutTests/platform/chromium/test_expectations.txt patch | blob | history

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 664b2d1..b2f7e18 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-02-06  Adam Barth  <abarth@webkit.org>
+
+        http/tests/security/mixedContent/insecure-plugin-in-iframe.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=77901
+
+        Reviewed by Eric Seidel.
+
+        This test fails occationally because of the order of the frame load
+        callbacks.  Now that we log mixed content errors to the console, we
+        don't need to dump the frame load callbacks in this test.
+
+        * http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt:
+        * http/tests/security/mixedContent/insecure-plugin-in-iframe.html:
+
 2012-02-06  Cris Neckar  <cdn@chromium.org>
 
         Test for crash when counter nodes are reparented outside of tables
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt
index 81fb4dd..1073075 100644 (file)
--- a/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe-expected.txt
@@ -1,14 +1,5 @@
-frame "<!--framePath //<!--frame0-->-->" - didStartProvisionalLoadForFrame
-main frame - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didCommitLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didFinishDocumentLoadForFrame
-frame "<!--framePath //<!--frame0-->-->" - didHandleOnloadEventsForFrame
-main frame - didHandleOnloadEventsForFrame
 CONSOLE MESSAGE: The page at https://127.0.0.1:8443/security/mixedContent/resources/frame-with-insecure-plugin.html ran insecure content from http://127.0.0.1:8000/security/mixedContent/resources/dummy.swf.
 
-didRunInsecureContent
-frame "<!--framePath //<!--frame0-->-->" - didFinishLoadForFrame
-main frame - didFinishLoadForFrame
 This test loads a secure iframe that loads an insecure plugin. We should get a mixed content callback because the insecure plug-in can script the secure origin.
 
 
diff --git a/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html
index bb94ebb..19bd529 100644 (file)
--- a/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html
+++ b/LayoutTests/http/tests/security/mixedContent/insecure-plugin-in-iframe.html
@@ -1,10 +1,8 @@
 <html>
 <body>
 <script>
-if (window.layoutTestController) {
+if (window.layoutTestController)
     layoutTestController.dumpAsText();
-    layoutTestController.dumpFrameLoadCallbacks();
-}
 </script>
 <p>This test loads a secure iframe that loads an insecure plugin.  We should
 get a mixed content callback because the insecure plug-in can script the secure
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 930b119..cbf1148 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -772,7 +772,6 @@ BUGCR39423 : security/block-test.html = TIMEOUT
 // Flaky: fails about 5% of the time.
 BUGCR31342 WIN RELEASE : security/block-test-no-port.html = PASS TEXT
 
-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
 BUGCR42044 WIN : http/tests/security/xss-DENIED-mime-type-execute-as-html.html = PASS TIMEOUT
Domain: Web Framework / Uncategorized;