Commit cbde819f authored by ossy@webkit.org's avatar ossy@webkit.org
Browse files

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 <webkit.review.bot@gmail.com> on 2012-10-29

Tools:

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

LayoutTests:

* platform/qt/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@132785 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 28fab5ba
2012-10-29 Sheriff Bot <webkit.review.bot@gmail.com>
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 <allan.jensen@digia.com>
 
[Qt] Flaky security tests
......@@ -2450,6 +2450,11 @@ webkit.org/b/90007 http/tests/security/mixedContent/insecure-audio-video-in-main
# 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 ]
......
2012-10-29 Sheriff Bot <webkit.review.bot@gmail.com>
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 <allan.jensen@digia.com>
[Qt] Flaky security tests
......
......@@ -510,17 +510,11 @@ void DumpRenderTree::dryRunPrint(QWebFrame* frame)
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();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment