summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2021-03-22 13:10:41 +0100
committerKirill Burtsev <kirill.burtsev@qt.io>2021-05-06 09:07:07 +0200
commitc3a81005a3bae6cc40e6c2421cabf0137ff8ff00 (patch)
treedbad3272a37d0e0c9ce1d2192ea9c4833237a721
parenta7d3b4cb07dd41ae020bdfa2973096332b9d4396 (diff)
Remove obsolete loadSignals test secondLoadForError_WhenErrorPageEnabled
Was added as is in 89bc70bf13, and was already blacklisted. Mostly duplicates logic of 'loadFinishedAfterNotFoundError' (which was added much earlier in aa8b11d3a5), but with a different expectations for the number of signals emitted. And that was never realized. Change-Id: I97bb539b936361089733dc6f26985c09c7bbc3d1 Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
-rw-r--r--tests/auto/widgets/loadsignals/BLACKLIST3
-rw-r--r--tests/auto/widgets/loadsignals/tst_loadsignals.cpp37
2 files changed, 0 insertions, 40 deletions
diff --git a/tests/auto/widgets/loadsignals/BLACKLIST b/tests/auto/widgets/loadsignals/BLACKLIST
index e5c625bd6..ffe1f71fe 100644
--- a/tests/auto/widgets/loadsignals/BLACKLIST
+++ b/tests/auto/widgets/loadsignals/BLACKLIST
@@ -1,6 +1,3 @@
-[secondLoadForError_WhenErrorPageEnabled:ErrorPageEnabled]
-*
-
# QTBUG-65223
[loadStartedAndFinishedCount:WithAnchorClickedFromJS]
*
diff --git a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
index 2dfe341d0..8112a274c 100644
--- a/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
+++ b/tests/auto/widgets/loadsignals/tst_loadsignals.cpp
@@ -48,8 +48,6 @@ private Q_SLOTS:
void monotonicity();
void loadStartedAndFinishedCount_data();
void loadStartedAndFinishedCount();
- void secondLoadForError_WhenErrorPageEnabled_data();
- void secondLoadForError_WhenErrorPageEnabled();
void loadAfterInPageNavigation_qtbug66869();
void fileDownloadDoesNotTriggerLoadSignals_qtbug66661();
void numberOfStartedAndFinishedSignalsIsSame();
@@ -150,41 +148,6 @@ void tst_LoadSignals::monotonicity()
}
/**
- * Test that we get a second loadStarted and loadFinished signal
- * for error-pages (unless error-pages are disabled)
- */
-void tst_LoadSignals::secondLoadForError_WhenErrorPageEnabled_data()
-{
- QTest::addColumn<bool>("enabled");
- // in this case, we get no second loadStarted and loadFinished, although we had
- // agreed on making the navigation to an error page an individual load
- QTest::newRow("ErrorPageEnabled") << true;
- QTest::newRow("ErrorPageDisabled") << false;
-}
-
-void tst_LoadSignals::secondLoadForError_WhenErrorPageEnabled()
-{
- QFETCH(bool, enabled);
- view.settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, enabled);
- int expectedLoadCount = (enabled ? 2 : 1);
-
- // RFC 2606 guarantees that this will never become a valid domain
- view.load(QUrl("http://nonexistent.invalid"));
- QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), expectedLoadCount, 10000);
- QVERIFY(!loadFinishedSpy[0][0].toBool());
- if (enabled)
- QVERIFY(loadFinishedSpy[1][0].toBool());
-
- // Wait for 10 seconds (abort waiting if another loadStarted or loadFinished occurs)
- QTRY_LOOP_IMPL((loadStartedSpy.size() != expectedLoadCount)
- || (loadFinishedSpy.size() != expectedLoadCount), 10000, 100);
-
- // No further loadStarted should have occurred within this time
- QCOMPARE(loadStartedSpy.size(), expectedLoadCount);
- QCOMPARE(loadFinishedSpy.size(), expectedLoadCount);
-}
-
-/**
* Test that a second load after an in-page navigation receives its expected loadStarted and
* loadFinished signal.
*/