[Qt] Flaky security tests

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

Reviewed by Jocelyn Turcotte.

Tools:

Disable text output and load a blank URL to ensure the documentLoader is cleared
before we start dumping text for the new page. Otherwise messages from the old page
may end up in the text output of the new test.

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

LayoutTests:

Unskip no longer flaky tests.

* platform/qt/TestExpectations:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@132782 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1afbceee
2012-10-29 Allan Sandfeld Jensen <allan.jensen@digia.com>
[Qt] Flaky security tests
https://bugs.webkit.org/show_bug.cgi?id=100388
Reviewed by Jocelyn Turcotte.
Unskip no longer flaky tests.
* platform/qt/TestExpectations:
2012-10-29 Pavel Podivilov <podivilov@google.com>
[Chromium] Test expectation update.
......@@ -2450,11 +2450,6 @@ 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 Allan Sandfeld Jensen <allan.jensen@digia.com>
[Qt] Flaky security tests
https://bugs.webkit.org/show_bug.cgi?id=100388
Reviewed by Jocelyn Turcotte.
Disable text output and load a blank URL to ensure the documentLoader is cleared
before we start dumping text for the new page. Otherwise messages from the old page
may end up in the text output of the new test.
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
2012-10-29 Jochen Eisinger <jochen@chromium.org>
[chromium] remove remaining usages of webkit_support from the TestRunner library
......
......@@ -510,11 +510,17 @@ void DumpRenderTree::dryRunPrint(QWebFrame* frame)
void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
{
// reset so that any current loads are stopped
// 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.
// 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->triggerAction(QWebPage::Stop);
m_page->mainFrame()->setUrl(QUrl("about:blank"));
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