Title: [132785] trunk
Revision
132785
Author
[email protected]
Date
2012-10-29 04:29:28 -0700 (Mon, 29 Oct 2012)

Log Message

Unreviewed, rolling out r132782.
http://trac.webkit.org/changeset/132782
https://bugs.webkit.org/show_bug.cgi?id=100653

It made 400+ tests fail and 180 tests flakey on Qt (Requested
by Ossy on #webkit).

Patch by Sheriff Bot <[email protected]> on 2012-10-29

Tools:

* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):

LayoutTests:

* platform/qt/TestExpectations:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (132784 => 132785)


--- trunk/LayoutTests/ChangeLog	2012-10-29 11:21:07 UTC (rev 132784)
+++ trunk/LayoutTests/ChangeLog	2012-10-29 11:29:28 UTC (rev 132785)
@@ -1,3 +1,14 @@
+2012-10-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r132782.
+        http://trac.webkit.org/changeset/132782
+        https://bugs.webkit.org/show_bug.cgi?id=100653
+
+        It made 400+ tests fail and 180 tests flakey on Qt (Requested
+        by Ossy on #webkit).
+
+        * platform/qt/TestExpectations:
+
 2012-10-29  Allan Sandfeld Jensen  <[email protected]>
 
         [Qt] Flaky security tests

Modified: trunk/LayoutTests/platform/qt/TestExpectations (132784 => 132785)


--- trunk/LayoutTests/platform/qt/TestExpectations	2012-10-29 11:21:07 UTC (rev 132784)
+++ trunk/LayoutTests/platform/qt/TestExpectations	2012-10-29 11:29:28 UTC (rev 132785)
@@ -2450,6 +2450,11 @@
 # Skip tests in fast/text/shaping
 webkit.org/b/90951 fast/text/shaping
 
+# Flaky tests
+webkit.org/b/91376 http/tests/security/sandboxed-iframe-modify-self.html [ Failure Pass ]
+webkit.org/b/91379 http/tests/security/contentSecurityPolicy/policy-does-not-affect-child.html [ Failure Pass ]
+webkit.org/b/91379 http/tests/security/contentSecurityPolicy/object-src-none-allowed.html [ Failure Pass ]
+
 webkit.org/b/99756 fast/events/touch/touch-slider.html [ Failure ]
 
 webkit.org/b/93247 [ Debug ] fast/lists/list-marker-remove-crash.html [ Crash ]

Modified: trunk/Tools/ChangeLog (132784 => 132785)


--- trunk/Tools/ChangeLog	2012-10-29 11:21:07 UTC (rev 132784)
+++ trunk/Tools/ChangeLog	2012-10-29 11:29:28 UTC (rev 132785)
@@ -1,3 +1,15 @@
+2012-10-29  Sheriff Bot  <[email protected]>
+
+        Unreviewed, rolling out r132782.
+        http://trac.webkit.org/changeset/132782
+        https://bugs.webkit.org/show_bug.cgi?id=100653
+
+        It made 400+ tests fail and 180 tests flakey on Qt (Requested
+        by Ossy on #webkit).
+
+        * DumpRenderTree/qt/DumpRenderTreeQt.cpp:
+        (WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
+
 2012-10-29  Allan Sandfeld Jensen  <[email protected]>
 
         [Qt] Flaky security tests

Modified: trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp (132784 => 132785)


--- trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp	2012-10-29 11:21:07 UTC (rev 132784)
+++ trunk/Tools/DumpRenderTree/qt/DumpRenderTreeQt.cpp	2012-10-29 11:29:28 UTC (rev 132785)
@@ -510,17 +510,11 @@
 
 void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
 {
-    // Disable text-output, because some document-loaders will output
-    // security signals when stopped, and we do not want them logged
-    // for the next test.
-    setTextOutputEnabled(false);
-    // Reset so that any current loads are stopped. We set to an empty
-    // URL here instead of issuing a stop action, since setUrl also
-    // clears the current document.
+    // reset so that any current loads are stopped
     // NOTE: that this has to be done before the testRunner is
     // reset or we get timeouts for some tests.
     m_page->blockSignals(true);
-    m_page->mainFrame()->setUrl(QUrl("about:blank"));
+    m_page->triggerAction(QWebPage::Stop);
     m_page->blockSignals(false);
 
     QList<QWebSecurityOrigin> knownOrigins = QWebSecurityOrigin::allOrigins();
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to