Stabilize tst_QWebEngineCookieStore

Centralize and increase the timeout for all QTRY_COMPARE and
QTRY_VERIFY to 30s.

Pick-to: 6.3
Change-Id: I582b3694ede65890f2707b50a78d2970e11b3fe8
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 48 insertions, 44 deletions

diff --git a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
index a712fb288..8b4f17a65 100644
--- a/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
+++ b/tests/auto/core/qwebenginecookiestore/tst_qwebenginecookiestore.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2017 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
 ** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWebEngine module of the Qt Toolkit.
@@ -35,6 +35,10 @@
 #include "httpserver.h"
 #include "httpreqrep.h"
 
+// locally overwrite the default timeout of QTY_(COMPARE|VERIFY)
+#define QWE_TRY_COMPARE(x, y) QTRY_COMPARE_WITH_TIMEOUT(x, y, 30000)
+#define QWE_TRY_VERIFY(x) QTRY_VERIFY_WITH_TIMEOUT(x, 30000)
+
 class tst_QWebEngineCookieStore : public QObject
 {
     Q_OBJECT
@@ -104,22 +108,22 @@ void tst_QWebEngineCookieStore::cookieSignals()
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
 
     // try whether updating a cookie to be expired results in that cookie being removed.
     QNetworkCookie expiredCookie(QNetworkCookie::parseCookies(QByteArrayLiteral("SessionCookie=delete; expires=Thu, 01-Jan-1970 00:00:00 GMT; path=///resources")).first());
     client->setCookie(expiredCookie, QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
     cookieRemovedSpy.clear();
 
     // try removing the other cookie.
     QNetworkCookie nonSessionCookie(QNetworkCookie::parseCookies(QByteArrayLiteral("CookieWithExpiresField=QtWebEngineCookieTest; path=///resources")).first());
     client->deleteCookie(nonSessionCookie, QUrl("qrc:///resources/index.html"));
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
 }
 
 void tst_QWebEngineCookieStore::setAndDeleteCookie()
@@ -140,33 +144,33 @@ void tst_QWebEngineCookieStore::setAndDeleteCookie()
     client->loadAllCookies();
     // /* FIXME remove 'blank' navigation once loadAllCookies api is fixed
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     // */
 
     // check if pending cookies are set and removed
     client->setCookie(cookie1);
     client->setCookie(cookie2);
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
     client->deleteCookie(cookie1);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
 
     page.load(QUrl("qrc:///resources/content.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 2);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
     cookieAddedSpy.clear();
     cookieRemovedSpy.clear();
 
     client->setCookie(cookie3);
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
     // updating a cookie with an expired 'expires' field should remove the cookie with the same name
     client->setCookie(expiredCookie3);
     client->deleteCookie(cookie2);
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 2);
 }
 
 void tst_QWebEngineCookieStore::batchCookieTasks()
@@ -185,29 +189,29 @@ void tst_QWebEngineCookieStore::batchCookieTasks()
     client->loadAllCookies();
     // /* FIXME remove 'blank' navigation once loadAllCookies api is fixed
     page.load(QUrl("about:blank"));
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     // */
 
     client->setCookie(cookie1);
     client->setCookie(cookie2);
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 2, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 2);
     QVariant success = loadSpy.takeFirst().takeFirst();
     QVERIFY(success.toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 4);
-    QTRY_COMPARE(cookieRemovedSpy.count(), 0);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 4);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 0);
 
     cookieAddedSpy.clear();
     cookieRemovedSpy.clear();
 
     client->deleteSessionCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 3);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 3);
 
     client->deleteAllCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 4);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 4);
 }
 
 void tst_QWebEngineCookieStore::basicFilter()
@@ -224,19 +228,19 @@ void tst_QWebEngineCookieStore::basicFilter()
 
     page.load(QUrl("qrc:///resources/index.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 2);
-    QTRY_COMPARE(accessTested.loadAcquire(), 2); // FIXME?
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 2);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 2); // FIXME?
 
     client->deleteAllCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 2);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 2);
 
     client->setCookieFilter([&](const QWebEngineCookieStore::FilterRequest &){ ++accessTested; return false; });
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(accessTested.loadAcquire(), 4); // FIXME?
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 4); // FIXME?
     // Test cookies are NOT added:
     QTest::qWait(100);
     QCOMPARE(cookieAddedSpy.count(), 2);
@@ -280,25 +284,25 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
     QUrl firstPartyUrl = httpServer.url("/test.html");
     page.load(firstPartyUrl);
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(accessTested.loadAcquire(), 4);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 4);
     QVERIFY(cookieRequestHeader.isEmpty());
 
-    QTRY_COMPARE(serverSpy.count(), 3);
+    QWE_TRY_COMPARE(serverSpy.count(), 3);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(!cookieRequestHeader.isEmpty());
-    QTRY_COMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(accessTested.loadAcquire(), 6);
+    QWE_TRY_COMPARE(cookieAddedSpy.count(), 1);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 6);
 
-    QTRY_COMPARE(serverSpy.count(), 5);
+    QWE_TRY_COMPARE(serverSpy.count(), 5);
 
     client->deleteAllCookies();
-    QTRY_COMPARE(cookieRemovedSpy.count(), 1);
+    QWE_TRY_COMPARE(cookieRemovedSpy.count(), 1);
 
     client->setCookieFilter([&](const QWebEngineCookieStore::FilterRequest &request) {
         resourceFirstParty.append(qMakePair(request.origin, request.firstPartyUrl));
@@ -306,24 +310,24 @@ void tst_QWebEngineCookieStore::basicFilterOverHTTP()
         return false;
     });
     page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(cookieRequestHeader.isEmpty());
     // Test cookies are NOT added:
     QTest::qWait(100);
     QCOMPARE(cookieAddedSpy.count(), 1);
-    QTRY_COMPARE(accessTested.loadAcquire(), 9);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 9);
 
-    QTRY_COMPARE(serverSpy.count(), 7);
+    QWE_TRY_COMPARE(serverSpy.count(), 7);
 
     page.triggerAction(QWebEnginePage::Reload);
-    QTRY_COMPARE(loadSpy.count(), 1);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QVERIFY(cookieRequestHeader.isEmpty());
     QCOMPARE(cookieAddedSpy.count(), 1);
 
     // Wait for last GET /favicon.ico
-    QTRY_COMPARE(serverSpy.count(), 9);
+    QWE_TRY_COMPARE(serverSpy.count(), 9);
     (void) httpServer.stop();
 
     QCOMPARE(resourceFirstParty.size(), accessTested.loadAcquire());
@@ -344,17 +348,17 @@ void tst_QWebEngineCookieStore::html5featureFilter()
 
     page.load(QUrl("qrc:///resources/content.html"));
 
-    QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 30000);
+    QWE_TRY_COMPARE(loadSpy.count(), 1);
     QVERIFY(loadSpy.takeFirst().takeFirst().toBool());
     QCOMPARE(accessTested.loadAcquire(), 0); // FIXME?
     QTest::ignoreMessage(QtCriticalMsg, QRegularExpression(".*Uncaught SecurityError.*sessionStorage.*"));
     page.runJavaScript("sessionStorage.test = 5;");
-    QTRY_COMPARE(accessTested.loadAcquire(), 1);
+    QWE_TRY_COMPARE(accessTested.loadAcquire(), 1);
 
     QTest::ignoreMessage(QtCriticalMsg, QRegularExpression(".*Uncaught SecurityError.*sessionStorage.*"));
     QAtomicInt callbackTriggered = 0;
     page.runJavaScript("sessionStorage.test", [&](const QVariant &v) { QVERIFY(!v.isValid()); callbackTriggered = 1; });
-    QTRY_VERIFY(callbackTriggered);
+    QWE_TRY_VERIFY(callbackTriggered);
 }
 
 QTEST_MAIN(tst_QWebEngineCookieStore)