From fc0dbde7345c37207a54eea04c67ee9160c86134 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 21 Oct 2019 14:45:44 +0200
Subject: Speculatively prepare for even slower CI

Bumb up timeouts to even more higher levels to accommodate even
slower CI instances.

Task-number: QTBUG-79290
Change-Id: I33a4660165f72837273c3089092687a8962c83ba
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 .../quick/inspectorserver/tst_inspectorserver.cpp  |  2 +-
 .../certificateerror/tst_certificateerror.cpp      | 14 ++++-----
 tests/auto/widgets/devtools/tst_devtools.cpp       |  4 +--
 .../widgets/faviconmanager/tst_faviconmanager.cpp  | 34 +++++++++++-----------
 .../qwebenginescript/tst_qwebenginescript.cpp      | 16 +++++-----
 .../widgets/qwebengineview/tst_qwebengineview.cpp  |  2 +-
 tests/auto/widgets/util.h                          |  2 +-
 7 files changed, 36 insertions(+), 38 deletions(-)

(limited to 'tests/auto')

diff --git a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
index 922c7769e..224814f7e 100644
--- a/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
+++ b/tests/auto/quick/inspectorserver/tst_inspectorserver.cpp
@@ -167,7 +167,7 @@ void tst_InspectorServer::openRemoteDebuggingSession()
     // - The page list didn't return a valid inspector URL
     // - Or the front-end couldn't be loaded through the inspector HTTP server
     // - Or the web socket connection couldn't be established between the front-end and the page through the inspector server
-    QTRY_VERIFY_WITH_TIMEOUT(inspectorWebView->title().startsWith("DevTools -"), 20000);
+    QTRY_VERIFY_WITH_TIMEOUT(inspectorWebView->title().startsWith("DevTools -"), 30000);
 }
 
 QTEST_MAIN(tst_InspectorServer)
diff --git a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
index 109c69cd7..f11d9236c 100644
--- a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
@@ -48,13 +48,13 @@ private Q_SLOTS:
 struct PageWithCertificateErrorHandler : QWebEnginePage
 {
     PageWithCertificateErrorHandler(bool defer, bool accept, QObject *p = nullptr)
-        : QWebEnginePage(p), deferError(defer), acceptCertificate(accept) {
-        connect(this, &QWebEnginePage::loadFinished, [&] (bool result) { spyLoad(result); });
+        : QWebEnginePage(p), deferError(defer), acceptCertificate(accept)
+        , loadSpy(this, &QWebEnginePage::loadFinished) {
     }
 
     bool deferError, acceptCertificate;
 
-    CallbackSpy<bool> spyLoad;
+    QSignalSpy loadSpy;
     QScopedPointer<QWebEngineCertificateError> error;
 
     bool certificateError(const QWebEngineCertificateError &e) override {
@@ -104,7 +104,7 @@ void tst_CertificateError::handleError()
     if (deferError) {
         QVERIFY(page.error->deferred());
         QVERIFY(!page.error->answered());
-        QVERIFY(!page.spyLoad.wasCalled());
+        QCOMPARE(page.loadSpy.count(), 0);
         QCOMPARE(toPlainTextSync(&page), QString());
 
         if (acceptCertificate)
@@ -115,10 +115,8 @@ void tst_CertificateError::handleError()
         QVERIFY(page.error->answered());
         page.error.reset();
     }
-
-    bool loadResult = page.spyLoad.waitForResult();
-    QVERIFY(page.spyLoad.wasCalled());
-    QCOMPARE(loadResult, acceptCertificate);
+    QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.count(), 1, 30000);
+    QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate);
     QCOMPARE(toPlainTextSync(&page), expectedContent);
 }
 
diff --git a/tests/auto/widgets/devtools/tst_devtools.cpp b/tests/auto/widgets/devtools/tst_devtools.cpp
index 8f3b90a14..3026b3931 100644
--- a/tests/auto/widgets/devtools/tst_devtools.cpp
+++ b/tests/auto/widgets/devtools/tst_devtools.cpp
@@ -46,7 +46,7 @@ void tst_DevTools::attachAndDestroyPageFirst()
 
     QSignalSpy spy(page, &QWebEnginePage::loadFinished);
     page->load(QUrl("data:text/plain,foobarbaz"));
-    QTRY_COMPARE(spy.count(),  1);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
 
     inspector->setInspectedPage(page);
     page->triggerAction(QWebEnginePage::InspectElement);
@@ -67,7 +67,7 @@ void tst_DevTools::attachAndDestroyInspectorFirst()
 
     QSignalSpy spy(page, &QWebEnginePage::loadFinished);
     page->setHtml(QStringLiteral("<body><h1>FOO BAR!</h1></body>"));
-    QTRY_COMPARE(spy.count(),  1);
+    QTRY_COMPARE_WITH_TIMEOUT(spy.count(), 1, 12000);
 
     page->triggerAction(QWebEnginePage::InspectElement);
 
diff --git a/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
index 540c8d505..1469ddb15 100644
--- a/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
+++ b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
@@ -107,7 +107,7 @@ void tst_FaviconManager::faviconLoad()
     QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-single.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -132,7 +132,7 @@ void tst_FaviconManager::faviconLoadFromResources()
     QUrl url("qrc:/resources/favicon-single.html");
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -161,7 +161,7 @@ void tst_FaviconManager::faviconLoadEncodedUrl()
     QUrl url(urlString + QLatin1String("?favicon=load should work with#whitespace!"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -189,7 +189,7 @@ void tst_FaviconManager::noFavicon()
     QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/test1.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -206,7 +206,7 @@ void tst_FaviconManager::aboutBlank()
     QUrl url("about:blank");
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -226,7 +226,7 @@ void tst_FaviconManager::unavailableFavicon()
     QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-unavailable.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -245,7 +245,7 @@ void tst_FaviconManager::errorPageEnabled()
     QUrl url("http://url.invalid");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 20000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -264,7 +264,7 @@ void tst_FaviconManager::errorPageDisabled()
     QUrl url("http://url.invalid");
     m_page->load(url);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 12000);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -288,7 +288,7 @@ void tst_FaviconManager::bestFavicon()
     url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-misc.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -311,7 +311,7 @@ void tst_FaviconManager::bestFavicon()
     url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-shortcut.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_VERIFY(iconUrlChangedSpy.count() >= 1);
     QTRY_VERIFY(iconChangedSpy.count() >= 1);
 
@@ -347,7 +347,7 @@ void tst_FaviconManager::touchIcon()
     QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-touch.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -367,7 +367,7 @@ void tst_FaviconManager::multiIcon()
     QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-multi.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -395,7 +395,7 @@ void tst_FaviconManager::candidateIcon()
     QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-shortcut.html"));
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -432,7 +432,7 @@ void tst_FaviconManager::downloadIconsDisabled()
 
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(iconUrlChangedSpy.count(), 0);
     QCOMPARE(iconChangedSpy.count(), 0);
 
@@ -465,7 +465,7 @@ void tst_FaviconManager::downloadTouchIconsEnabled()
 
     m_page->load(url);
 
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -494,7 +494,7 @@ void tst_FaviconManager::dynamicFavicon()
     m_page->setHtml("<html>"
                     "<link rel='icon' type='image/png' href='data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='/>"
                     "</html>");
-    QTRY_COMPARE(loadFinishedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
@@ -525,7 +525,7 @@ void tst_FaviconManager::touchIconWithSameURL()
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
 
     // The default favicon has to be loaded even if its URL is also set as a touch icon while touch icons are disabled.
-    QTRY_COMPARE(iconUrlChangedSpy.count(), 1);
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 30000);
     QCOMPARE(m_page->iconUrl().toString(), icon);
     QTRY_COMPARE(iconChangedSpy.count(), 1);
 
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 2e8687d9b..2044f0df4 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -180,23 +180,23 @@ void tst_QWebEngineScript::loadEvents()
 
     // Single frame / setHtml
     page.setHtml(QStringLiteral("<!DOCTYPE html><html><head><title>mr</title></head><body></body></html>"));
-    QTRY_COMPARE(page.spy.count(), 1);
-    QCOMPARE(page.spy.takeFirst().value(0).toBool(), true);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
 
     // After discard
     page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
     page.setLifecycleState(QWebEnginePage::LifecycleState::Active);
-    QTRY_COMPARE(page.spy.count(), 1);
-    QCOMPARE(page.spy.takeFirst().value(0).toBool(), true);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
 
     // Multiple frames
     page.load(QUrl("qrc:/resources/test_iframe_main.html"));
-    QTRY_COMPARE(page.spy.count(), 1);
-    QCOMPARE(page.spy.takeFirst().value(0).toBool(), true);
+    QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
+    QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window[0].log", QWebEngineScript::MainWorld).toStringList()));
@@ -207,14 +207,14 @@ void tst_QWebEngineScript::loadEvents()
     // Cross-process navigation
     page.load(QUrl("chrome://gpu"));
     QTRY_COMPARE_WITH_TIMEOUT(page.spy.count(), 1, 20000);
-    QCOMPARE(page.spy.takeFirst().value(0).toBool(), true);
+    QVERIFY(page.spy.takeFirst().value(0).toBool());
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::MainWorld).toStringList()));
     QVERIFY(verifyOrder(page.eval("window.log", QWebEngineScript::ApplicationWorld).toStringList()));
 
     // Using window.open from JS
     QVERIFY(profile.pages.size() == 1);
     page.load(QUrl("qrc:/resources/test_window_open.html"));
-    QTRY_VERIFY(profile.pages.size() == 2);
+    QTRY_COMPARE(profile.pages.size(), 2);
     QTRY_COMPARE(profile.pages.front().spy.count(), 1);
     QTRY_COMPARE(profile.pages.back().spy.count(), 1);
     QVERIFY(verifyOrder(profile.pages.front().eval("window.log", QWebEngineScript::MainWorld).toStringList()));
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index 71c4aa9b5..abf414eb9 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -3125,7 +3125,7 @@ void tst_QWebEngineView::webUIURLs()
     view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));
     view.load(url);
-    QVERIFY(loadFinishedSpy.wait());
+    QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.count(), 1, 12000);
     QCOMPARE(loadFinishedSpy.takeFirst().at(0).toBool(), supported);
 }
 
diff --git a/tests/auto/widgets/util.h b/tests/auto/widgets/util.h
index f27466225..eba974f33 100644
--- a/tests/auto/widgets/util.h
+++ b/tests/auto/widgets/util.h
@@ -85,7 +85,7 @@ public:
 
     T waitForResult() {
         if (!called) {
-            timeoutTimer.start(10000);
+            timeoutTimer.start(20000);
             eventLoop.exec();
         }
         return result;
-- 
cgit v1.2.3