summaryrefslogtreecommitdiffstats
path: root/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp')
-rw-r--r--tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp22
1 files changed, 5 insertions, 17 deletions
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
index 6350c8510..00d4bae5a 100644
--- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
+++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp
@@ -222,18 +222,6 @@ private:
}
};
-static bool loadSync(QWebEnginePage *page, const QUrl &url, bool ok = true)
-{
- QSignalSpy spy(page, &QWebEnginePage::loadFinished);
- page->load(url);
- return (!spy.empty() || spy.wait(20000)) && (spy.front().value(0).toBool() == ok);
-}
-
-static bool loadSync(QWebEngineView *view, const QUrl &url, bool ok = true)
-{
- return loadSync(view->page(), url, ok);
-}
-
void tst_QWebEngineProfile::clearDataFromCache()
{
TestServer server;
@@ -258,7 +246,7 @@ void tst_QWebEngineProfile::clearDataFromCache()
QTest::qWait(1000);
QVERIFY(sizeBeforeClear > totalSize(cacheDir));
- QVERIFY(server.stop());
+ (void)server.stop();
}
void tst_QWebEngineProfile::disableCache()
@@ -283,7 +271,7 @@ void tst_QWebEngineProfile::disableCache()
QVERIFY(loadSync(&page, server.url("/hedgehog.html")));
QVERIFY(cacheDir.exists("Cache"));
- QVERIFY(server.stop());
+ (void)server.stop();
}
class RedirectingUrlSchemeHandler : public QWebEngineUrlSchemeHandler
@@ -876,7 +864,7 @@ void tst_QWebEngineProfile::changePersistentPath()
QVERIFY(loadSync(&page, server.url("/hedgehog.html")));
QVERIFY(dataDir2.exists());
- QVERIFY(server.stop());
+ (void)server.stop();
}
void tst_QWebEngineProfile::changeHttpUserAgent()
@@ -949,7 +937,7 @@ void tst_QWebEngineProfile::changeUseForGlobalCertificateVerification()
page.reset(new QWebEnginePage(&profile));
QVERIFY(loadSync(page.get(), server.url("/hedgehog.html")));
// Don't check for error: there can be disconnects during GET hedgehog.png.
- server.stop();
+ (void)server.stop();
}
void tst_QWebEngineProfile::changePersistentCookiesPolicy()
@@ -973,7 +961,7 @@ void tst_QWebEngineProfile::changePersistentCookiesPolicy()
QVERIFY(loadSync(&page, server.url("/hedgehog.html")));
QVERIFY(dataDir.exists("Cookies"));
- QVERIFY(server.stop());
+ (void)server.stop();
}
class InitiatorSpy : public QWebEngineUrlSchemeHandler