Title: [141582] trunk/Source/WebKit/qt
- Revision
- 141582
- Author
- [email protected]
- Date
- 2013-02-01 05:00:32 -0800 (Fri, 01 Feb 2013)
Log Message
[Qt] Fix hanging deleteQWebViewTwice test
Reviewed by Allan Sandfeld Jensen.
Don't use QCoreApplication::instance()->exec(), because in case of a bug
that never finishes. Instead use waitForSignal() which has the concept of
a timeout.
* tests/qwebpage/tst_qwebpage.cpp:
(tst_QWebPage::deleteQWebViewTwice):
Modified Paths
Diff
Modified: trunk/Source/WebKit/qt/ChangeLog (141581 => 141582)
--- trunk/Source/WebKit/qt/ChangeLog 2013-02-01 12:56:17 UTC (rev 141581)
+++ trunk/Source/WebKit/qt/ChangeLog 2013-02-01 13:00:32 UTC (rev 141582)
@@ -1,5 +1,18 @@
2013-02-01 Simon Hausmann <[email protected]>
+ [Qt] Fix hanging deleteQWebViewTwice test
+
+ Reviewed by Allan Sandfeld Jensen.
+
+ Don't use QCoreApplication::instance()->exec(), because in case of a bug
+ that never finishes. Instead use waitForSignal() which has the concept of
+ a timeout.
+
+ * tests/qwebpage/tst_qwebpage.cpp:
+ (tst_QWebPage::deleteQWebViewTwice):
+
+2013-02-01 Simon Hausmann <[email protected]>
+
[Qt] Skip hanging WebGL software fallback tests
Reviewed by Allan Sandfeld Jensen.
Modified: trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp (141581 => 141582)
--- trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp 2013-02-01 12:56:17 UTC (rev 141581)
+++ trunk/Source/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp 2013-02-01 13:00:32 UTC (rev 141582)
@@ -3133,8 +3133,7 @@
mainWindow.setCentralWidget(webView);
webView->load(QUrl("qrc:///resources/frame_a.html"));
mainWindow.show();
- connect(webView, SIGNAL(loadFinished(bool)), &mainWindow, SLOT(close()));
- QApplication::instance()->exec();
+ QVERIFY(::waitForSignal(webView, SIGNAL(loadFinished(bool))));
}
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
