Commit 9e9739eb authored by chang.shu@nokia.com's avatar chang.shu@nokia.com

2011-01-28 Chang Shu <chang.shu@nokia.com>

        Reviewed by Andreas Kling.

        Unskipp auth.html after fix.
        https://bugs.webkit.org/show_bug.cgi?id=36688

        * platform/qt/Skipped:
2011-01-28  Chang Shu  <chang.shu@nokia.com>

        Reviewed by Andreas Kling.

        Reset NetworkAccessManager to clean up credentials from previous tests.
        This change causes no performance overhead either.
        https://bugs.webkit.org/show_bug.cgi?id=36688

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

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@76958 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent ef133987
2011-01-28 Chang Shu <chang.shu@nokia.com>
Reviewed by Andreas Kling.
Unskipp auth.html after fix.
https://bugs.webkit.org/show_bug.cgi?id=36688
* platform/qt/Skipped:
2011-01-28 Dimitri Glazkov <dglazkov@chromium.org>
Added newly-failing tests to expectations, will be fixing them shortly.
......@@ -4968,10 +4968,6 @@ http/tests/local/link-stylesheet-load-order-preload.html
# https://bugs.webkit.org/show_bug.cgi?id=51324
fast/text/emphasis-overlap.html
#[Qt] LayoutTests/http/tests/appcache/auth.html failed and skipped
# https://bugs.webkit.org/show_bug.cgi?id=36688
http/tests/appcache/auth.html
# REGRESSION(r74971): [Qt] /editing/selection/caret-bidi-first-and-last-letters.html fails
# https://bugs.webkit.org/show_bug.cgi?id=51884
editing/selection/caret-bidi-first-and-last-letters.html
......
2011-01-28 Chang Shu <chang.shu@nokia.com>
Reviewed by Andreas Kling.
Reset NetworkAccessManager to clean up credentials from previous tests.
This change causes no performance overhead either.
https://bugs.webkit.org/show_bug.cgi?id=36688
* DumpRenderTree/qt/DumpRenderTreeQt.cpp:
(WebCore::DumpRenderTree::resetToConsistentStateBeforeTesting):
(WebCore::DumpRenderTree::open):
* DumpRenderTree/qt/DumpRenderTreeQt.h:
2011-01-28 Zoltan Horvath <zoltan@webkit.org>
Reviewed by Andreas Kling.
......@@ -520,7 +520,7 @@ void DumpRenderTree::dryRunPrint(QWebFrame* frame)
#endif
}
void DumpRenderTree::resetToConsistentStateBeforeTesting()
void DumpRenderTree::resetToConsistentStateBeforeTesting(const QUrl& url)
{
// reset so that any current loads are stopped
// NOTE: that this has to be done before the layoutTestController is
......@@ -550,6 +550,14 @@ void DumpRenderTree::resetToConsistentStateBeforeTesting()
m_page->mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAsNeeded);
m_page->mainFrame()->setScrollBarPolicy(Qt::Horizontal, Qt::ScrollBarAsNeeded);
if (url.scheme() == "http" || url.scheme() == "https") {
// credentials may exist from previous tests.
m_page->setNetworkAccessManager(0);
delete m_networkAccessManager;
m_networkAccessManager = new NetworkAccessManager(this);
m_page->setNetworkAccessManager(m_networkAccessManager);
}
WorkQueue::shared()->clear();
WorkQueue::shared()->setFrozen(false);
......@@ -583,7 +591,7 @@ static bool isWebInspectorTest(const QUrl& url)
void DumpRenderTree::open(const QUrl& url)
{
DumpRenderTreeSupportQt::dumpResourceLoadCallbacksPath(QFileInfo(url.toString()).path());
resetToConsistentStateBeforeTesting();
resetToConsistentStateBeforeTesting(url);
if (isWebInspectorTest(m_page->mainFrame()->url()))
layoutTestController()->closeWebInspector();
......
......@@ -86,7 +86,7 @@ public:
void setDumpPixels(bool);
void closeRemainingWindows();
void resetToConsistentStateBeforeTesting();
void resetToConsistentStateBeforeTesting(const QUrl&);
LayoutTestController *layoutTestController() const { return m_controller; }
EventSender *eventSender() const { return m_eventSender; }
......
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