[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

Wed Dec 22 13:51:28 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit dbc74c3c290050b2da208786f392763129668ad9
Author: benjamin.poulain at nokia.com <benjamin.poulain at nokia.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 28 12:18:41 2010 +0000

    2010-09-28  Benjamin Poulain  <benjamin.poulain at nokia.com>
    
            Reviewed by Kenneth Rohde Christiansen.
    
            [Qt] tst_QWebPage::testStopScheduledPageRefresh() fails on MeeGo handset
            https://bugs.webkit.org/show_bug.cgi?id=46706
    
            The test require the network to succeed or fail in order to work.
            On MeeGo, the network can simply timeout the because of the netword access
            management. This patch makes the test use local URLs to avoid the
            problem.
    
            * tests/qwebpage/tst_qwebpage.cpp:
            (TestNetworkManager::TestNetworkManager):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@68507 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/qt/ChangeLog b/WebKit/qt/ChangeLog
index b30b397..9a92fa1 100644
--- a/WebKit/qt/ChangeLog
+++ b/WebKit/qt/ChangeLog
@@ -1,3 +1,18 @@
+2010-09-28  Benjamin Poulain  <benjamin.poulain at nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        [Qt] tst_QWebPage::testStopScheduledPageRefresh() fails on MeeGo handset
+        https://bugs.webkit.org/show_bug.cgi?id=46706
+
+        The test require the network to succeed or fail in order to work.
+        On MeeGo, the network can simply timeout the because of the netword access
+        management. This patch makes the test use local URLs to avoid the
+        problem.
+
+        * tests/qwebpage/tst_qwebpage.cpp:
+        (TestNetworkManager::TestNetworkManager):
+
 2010-09-27  Kenneth Rohde Christiansen  <kenneth.christiansen at openbossa.org>
 
         Reviewed by Antonio Gomes.
diff --git a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
index 10af94c..b8d4aba 100644
--- a/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
+++ b/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp
@@ -2189,23 +2189,23 @@ void tst_QWebPage::testStopScheduledPageRefresh()
     QWebPage page1;
     page1.setNetworkAccessManager(new TestNetworkManager(&page1));
     page1.mainFrame()->setHtml("<html><head>"
-                                "<meta http-equiv=\"refresh\"content=\"0;URL=http://qt.nokia.com/favicon.ico\">"
+                                "<meta http-equiv=\"refresh\"content=\"0;URL=qrc:///resources/index.html\">"
                                 "</head><body><h1>Page redirects immediately...</h1>"
                                 "</body></html>");
     QVERIFY(::waitForSignal(&page1, SIGNAL(loadFinished(bool))));
     QTest::qWait(500);
-    QCOMPARE(page1.mainFrame()->url().toString(), QString("http://qt.nokia.com/favicon.ico"));
+    QCOMPARE(page1.mainFrame()->url(), QUrl(QLatin1String("qrc:///resources/index.html")));
     
     // With QWebPage::StopScheduledPageRefresh
     QWebPage page2;
     page2.setNetworkAccessManager(new TestNetworkManager(&page2));
     page2.mainFrame()->setHtml("<html><head>"
-                               "<meta http-equiv=\"refresh\"content=\"1;URL=http://qt.nokia.com/favicon.ico\">"
+                               "<meta http-equiv=\"refresh\"content=\"1;URL=qrc:///resources/index.html\">"
                                "</head><body><h1>Page redirect test with 1 sec timeout...</h1>"
                                "</body></html>");
     page2.triggerAction(QWebPage::StopScheduledPageRefresh);
     QTest::qWait(1500);
-    QCOMPARE(page2.mainFrame()->url().toString(), QString("about:blank"));
+    QCOMPARE(page2.mainFrame()->url().toString(), QLatin1String("about:blank"));
 }
 
 void tst_QWebPage::findText()

-- 
WebKit Debian packaging

