Changeset 100053 in webkit

Timestamp:

Nov 11, 2011, 5:38:02 PM (15 years ago)

Author:

commit-queue@webkit.org

Message:

[Qt] Skip tests when no network is present
​https://bugs.webkit.org/show_bug.cgi?id=72031

Patch by Bruno de Oliveira Abinader <Bruno de Oliveira Abinader> on 2011-11-11
Reviewed by Simon Hausmann.

Some benchmark tests requires network connection (they fetch data from
external URL's) and so they fail if no network is present. These tests
should be skipped instead.

• tests/benchmarks/loading/tst_loading.cpp:

(tst_Loading::load): Skip test if no network is present.

• tests/benchmarks/painting/tst_painting.cpp:

(tst_Painting::paint): Skip test if no network is present.

Location:

trunk/Source/WebKit/qt

Files:

• ChangeLog (modified) (1 diff)
• tests/benchmarks/loading/tst_loading.cpp (modified) (3 diffs)
• tests/benchmarks/painting/tst_painting.cpp (modified) (3 diffs)

trunk/Source/WebKit/qt/ChangeLog

@@ +1 @@
+2011-11-11  Bruno de Oliveira Abinader  <bruno.abinader@basyskom.com>
+
+        [Qt] Skip tests when no network is present
+        https://bugs.webkit.org/show_bug.cgi?id=72031
+
+        Reviewed by Simon Hausmann.
+
+        Some benchmark tests requires network connection (they fetch data from
+        external URL's) and so they fail if no network is present. These tests
+        should be skipped instead.
+
+        * tests/benchmarks/loading/tst_loading.cpp:
+        (tst_Loading::load): Skip test if no network is present.
+        * tests/benchmarks/painting/tst_painting.cpp:
+        (tst_Painting::paint): Skip test if no network is present.
+
 2011-11-11  Sheriff Bot  <webkit.review.bot@gmail.com>
 

trunk/Source/WebKit/qt/tests/benchmarks/loading/tst_loading.cpp

@@ -17 +17 @@
  * Boston, MA 02110-1301, USA.
  */
+
+#include <QNetworkConfigurationManager>
 
 #include <QtTest/QtTest>
@@ -62 +64 @@
 
 private:
+    QNetworkConfigurationManager m_manager;
     QWebView* m_view;
     QWebPage* m_page;
@@ -93 +96 @@
     QFETCH(QUrl, url);
 
+    if (!m_manager.isOnline())
+        QSKIP("This test requires an active network connection", SkipSingle);
 
     QBENCHMARK {

trunk/Source/WebKit/qt/tests/benchmarks/painting/tst_painting.cpp

@@ -17 +17 @@
  * Boston, MA 02110-1301, USA.
  */
+
+#include <QNetworkConfigurationManager>
 
 #include <QtTest/QtTest>
@@ -64 +66 @@
 
 private:
+    QNetworkConfigurationManager m_manager;
     QWebView* m_view;
     QWebPage* m_page;
@@ -92 +95 @@
 {
     QFETCH(QUrl, url);
+
+    if (!m_manager.isOnline())
+        QSKIP("This test requires an active network connection", SkipSingle);
 
     m_view->load(url);