diff options
| author | Jüri Valdmann <juri.valdmann@qt.io> | 2019-05-02 14:21:12 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2021-09-29 14:04:16 +0000 |
| commit | cb733a4831c9fc0b027e24a78391ab0e869eb357 (patch) | |
| tree | cdd975fa7e2c722b18cc29fa8c5a8c0f7977a395 | |
| parent | 67194333916289ae7dd3ece6b0e2131f665c1916 (diff) | |
Skip tst_QWebEngineProfile::qtbug_71895 if network load fails
Fix also bug id which is incorrect.
Fixes: QTBUG-96925
Task-number: QTBUG-71895
(cherry picked from commit 27a2a77d2abed034129077db74302194f042e8da)
Change-Id: I0daf14c4ec31dfb867d9d7f531b9fdc6f7244e1b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| -rw-r--r-- | tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp index 3fc8fb45a..e4fc8ec53 100644 --- a/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp +++ b/tests/auto/widgets/qwebengineprofile/tst_qwebengineprofile.cpp @@ -62,7 +62,7 @@ private Q_SLOTS: void changePersistentPath(); void initiator(); void badDeleteOrder(); - void qtbug_72299(); // this should be the last test + void qtbug_71895(); // this should be the last test }; void tst_QWebEngineProfile::initTestCase() @@ -649,7 +649,7 @@ void tst_QWebEngineProfile::badDeleteOrder() delete view; } -void tst_QWebEngineProfile::qtbug_72299() +void tst_QWebEngineProfile::qtbug_71895() { QWebEngineView view; QSignalSpy loadSpy(view.page(), SIGNAL(loadFinished(bool))); @@ -659,8 +659,9 @@ void tst_QWebEngineProfile::qtbug_72299() view.page()->profile()->setHttpCacheType(QWebEngineProfile::NoCache); view.page()->profile()->cookieStore()->deleteAllCookies(); view.page()->profile()->setPersistentCookiesPolicy(QWebEngineProfile::NoPersistentCookies); - QTRY_COMPARE_WITH_TIMEOUT(loadSpy.count(), 1, 20000); - QVERIFY(loadSpy.front().front().toBool()); + bool gotSignal = loadSpy.count() || loadSpy.wait(20000); + if (!gotSignal) + QSKIP("Couldn't load page from network, skipping test."); } |