summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <[email protected]>2025-08-14 12:57:57 +0200
committerQt Cherry-pick Bot <[email protected]>2025-08-19 22:52:24 +0000
commit93099a2f17185da2caa032c006c2ee0caddb4650 (patch)
tree2da6f25b11bef9a336ad18dee32791f7b7fa1a3f
parent435f7e59cd7b998761039cc6173b573de4e95187 (diff)
More patient tests6.10
Increasing timeouts to pass more tests on the ignore arm64 platforms. Change-Id: I17ce98a90a2aa2bccb67fe5576af0ddbc9cb127f Reviewed-by: Moss Heim <[email protected]> (cherry picked from commit 4dfc6e4598310641b94a9c16764d2561883f1046) Reviewed-by: Qt Cherry-pick Bot <[email protected]>
Diffstat
-rw-r--r--tests/auto/core/qwebengineframe/tst_qwebengineframe.cpp2
-rw-r--r--tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp12
-rw-r--r--tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp28
3 files changed, 21 insertions, 21 deletions
diff --git a/tests/auto/core/qwebengineframe/tst_qwebengineframe.cpp b/tests/auto/core/qwebengineframe/tst_qwebengineframe.cpp
index c176be70e..d4d6cab99 100644
--- a/tests/auto/core/qwebengineframe/tst_qwebengineframe.cpp
+++ b/tests/auto/core/qwebengineframe/tst_qwebengineframe.cpp
@@ -109,7 +109,7 @@ void tst_QWebEngineFrame::htmlName()
QWebEnginePage page;
QSignalSpy loadSpy{ &page, SIGNAL(loadFinished(bool)) };
page.load(QUrl("qrc:/resources/iframes.html"));
- QTRY_COMPARE(loadSpy.size(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 10000);
auto children = page.mainFrame().children();
QCOMPARE(children.at(0).name(), "test-subframe0");
QCOMPARE(children.at(0).htmlName(), "iframe0-300x200");
diff --git a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
index 1dfa94565..1c2d761fb 100644
--- a/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
+++ b/tests/auto/widgets/qwebenginescript/tst_qwebenginescript.cpp
@@ -300,7 +300,7 @@ void tst_QWebEngineScript::viewSource()
page.scripts().insert(script);
page.load(QUrl("view-source:about:blank"));
QSignalSpy spy(&page, &QWebEnginePage::loadFinished);
- QTRY_COMPARE(spy.size(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(spy.size(), 1, 10000);
QCOMPARE(spy.takeFirst().value(0).toBool(), true);
QCOMPARE(evaluateJavaScriptSync(&page, "foo"), QVariant(42));
}
@@ -314,12 +314,12 @@ void tst_QWebEngineScript::scriptModifications()
script.setWorldId(QWebEngineScript::MainWorld);
script.setSourceCode("var foo = \"SUCCESS\";");
page.scripts().insert(script);
+ QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
page.setHtml(QStringLiteral("<html><head><script>document.addEventListener(\"DOMContentLoaded\", function() {\
document.body.innerText = foo;});\
</script></head><body></body></html>"));
QVERIFY(page.scripts().count() == 1);
- QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
- QVERIFY(spyFinished.wait());
+ QTRY_VERIFY_WITH_TIMEOUT(spyFinished.size(), 10000);
QCOMPARE(evaluateJavaScriptSync(&page, "document.body.innerText"), QVariant::fromValue(QStringLiteral("SUCCESS")));
script.setSourceCode("var foo = \"FAILURE\"");
page.triggerAction(QWebEnginePage::ReloadAndBypassCache);
@@ -403,9 +403,9 @@ void tst_QWebEngineScript::webChannel()
QWebEngineScript script = webChannelScript();
script.setWorldId(worldId);
page.scripts().insert(script);
- page.setHtml(QStringLiteral("<html><body></body></html>"));
QSignalSpy spyFinished(&page, &QWebEnginePage::loadFinished);
- QVERIFY(spyFinished.wait());
+ page.setHtml(QStringLiteral("<html><body></body></html>"));
+ QTRY_VERIFY_WITH_TIMEOUT(spyFinished.size(), 10000);
if (reloadFirst) {
// Check that the transport is also reinstalled on navigation
page.triggerAction(QWebEnginePage::Reload);
@@ -572,7 +572,7 @@ void tst_QWebEngineScript::navigation()
QString url3 = QStringLiteral("qrc:/resources/test_iframe_main.html");
page.setUrl(url3);
- QTRY_COMPARE(spyTextChanged.size(), 3);
+ QTRY_COMPARE_WITH_TIMEOUT(spyTextChanged.size(), 3, 10000);
QCOMPARE(testObject.text(), url3);
page.setLifecycleState(QWebEnginePage::LifecycleState::Discarded);
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index ec41856e4..37077871b 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -400,7 +400,7 @@ void tst_QWebEngineView::changePage()
QSignalSpy pageFromLoadSpy(pageFrom.get(), &QWebEnginePage::loadFinished);
QSignalSpy pageFromIconLoadSpy(pageFrom.get(), &QWebEnginePage::iconChanged);
pageFrom->load(urlFrom);
- QTRY_COMPARE(pageFromLoadSpy.size(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(pageFromLoadSpy.size(), 1, 10000);
QCOMPARE(pageFromLoadSpy.last().value(0).toBool(), true);
if (!fromIsNullPage) {
QTRY_COMPARE(pageFromIconLoadSpy.size(), 1);
@@ -1271,7 +1271,7 @@ void tst_QWebEngineView::focusInternalRenderWidgetHostViewQuickItem()
webView->setHtml("<html><body>"
" <input id='input1' type='text'/>"
"</body></html>");
- QTRY_COMPARE(loadSpy.size(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(loadSpy.size(), 1, 10000);
QTRY_COMPARE(webView->hasFocus(), false);
// Manually trigger focus.
@@ -1398,7 +1398,7 @@ void tst_QWebEngineView::mixLangLocale()
auto sc = connect(view.page(), &QWebEnginePage::renderProcessTerminated, [&] () { terminated = true; });
view.load(QUrl("qrc:///resources/dummy.html"));
- QTRY_VERIFY(terminated || loadSpy.size() == 1);
+ QTRY_VERIFY_WITH_TIMEOUT(terminated || loadSpy.size() == 1, 10000);
QVERIFY2(!terminated,
qPrintable(QString("Locale [%1] terminated: %2, loaded: %3").arg(locale).arg(terminated).arg(loadSpy.size())));
@@ -1618,7 +1618,7 @@ void tst_QWebEngineView::keyboardFocusAfterPopup()
// Trigger QCompleter's popup and select the first suggestion.
QTest::keyClick(QApplication::focusWindow(), Qt::Key_T);
- QTRY_VERIFY(QApplication::activePopupWidget());
+ QTRY_VERIFY_WITH_TIMEOUT(QApplication::activePopupWidget(), 10000);
QTest::keyClick(QApplication::focusWindow(), Qt::Key_Down);
QTest::keyClick(QApplication::focusWindow(), Qt::Key_Enter);
@@ -2067,7 +2067,7 @@ void tst_QWebEngineView::inputContextQueryInput()
view.setHtml("<html><body>"
" <input type='text' id='input1' value='' size='50'/>"
"</body></html>");
- QTRY_COMPARE(loadFinishedSpy.size(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 10000);
QVERIFY(QTest::qWaitForWindowActive(&view));
QCOMPARE(testContext.infos.size(), 0);
@@ -2219,7 +2219,7 @@ void tst_QWebEngineView::inputMethods()
view.setHtml("<html><body>"
" <input type='text' id='input1' style='font-family: serif' value='' maxlength='20' size='50'/>"
"</body></html>");
- QTRY_COMPARE(loadFinishedSpy.size(), 1);
+ QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpy.size(), 1, 10000);
QVERIFY(QTest::qWaitForWindowExposed(&view));
QPoint textInputCenter = elementCenter(view.page(), "input1");
@@ -2401,7 +2401,7 @@ void tst_QWebEngineView::textSelectionOutOfInputField()
view.setHtml("<html><body>"
" This is a text"
"</body></html>");
- QVERIFY(loadFinishedSpy.wait());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
QVERIFY(QTest::qWaitForWindowExposed(&view));
QCOMPARE(selectionChangedSpy.size(), 0);
@@ -2495,7 +2495,7 @@ void tst_QWebEngineView::hiddenText()
" <input type='text' id='input1' value='QtWebEngine' size='50'/><br>"
" <input type='password' id='password1'/>"
"</body></html>");
- QVERIFY(loadFinishedSpy.wait());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
QPoint passwordInputCenter = elementCenter(view.page(), "password1");
QTest::mouseClick(view.focusProxy(), Qt::LeftButton, {}, passwordInputCenter);
@@ -2522,7 +2522,7 @@ void tst_QWebEngineView::emptyInputMethodEvent()
view.setHtml("<html><body>"
" <input type='text' id='input1' value='QtWebEngine'/>"
"</body></html>");
- QVERIFY(loadFinishedSpy.wait());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
QVERIFY(QTest::qWaitForWindowExposed(&view));
evaluateJavaScriptSync(view.page(), "var inputEle = document.getElementById('input1'); inputEle.focus(); inputEle.select();");
@@ -2920,7 +2920,7 @@ void tst_QWebEngineView::imeJSInputEvents()
" <div id='input' contenteditable='true' style='border-style: solid;'></div>"
" <pre id='log'></pre>"
"</body></html>");
- QVERIFY(loadFinishedSpy.wait());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
QVERIFY(QTest::qWaitForWindowExposed(&view));
evaluateJavaScriptSync(view.page(), "document.getElementById('input').focus()");
@@ -3327,7 +3327,7 @@ void tst_QWebEngineView::mouseLeave()
" <div id='testDiv' style='width: 100%; height: 100%; background-color: green' />"
"</body>"
"</html>");
- QVERIFY(loadFinishedSpy.wait());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
// Make sure the testDiv text is empty.
evaluateJavaScriptSync(view->page(), "document.getElementById('testDiv').innerText = ''");
QTRY_VERIFY(innerText().isEmpty());
@@ -4011,7 +4011,7 @@ void tst_QWebEngineView::longKeyEventText()
view.resize(200, 400);
view.show();
view.setHtml(html);
- QTRY_VERIFY(loadFinishedSpy.size());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
QSignalSpy consoleMessageSpy(&page, &ConsolePage::done);
Qt::Key key(Qt::Key_Shift);
QKeyEvent event(QKeyEvent::KeyPress, key, Qt::NoModifier, QKeySequence(key).toString());
@@ -4031,7 +4031,7 @@ void tst_QWebEngineView::deferredDelete()
QSignalSpy loadFinishedSpy(view.page(), &QWebEnginePage::loadFinished);
view.load(QUrl("chrome://qt"));
view.show();
- QTRY_VERIFY(loadFinishedSpy.size());
+ QTRY_VERIFY_WITH_TIMEOUT(loadFinishedSpy.size(), 10000);
// QWebEngineView and WebEngineQuickWidget
QCOMPARE(QApplication::allWidgets().size(), desktopWidget + 2);
}
@@ -4072,7 +4072,7 @@ void tst_QWebEngineView::setCursorOnEmbeddedView()
QVERIFY(QTest::qWaitForWindowActive(&parentWidget));
- QTRY_VERIFY(firstPaintSpy.size());
+ QTRY_VERIFY_WITH_TIMEOUT(firstPaintSpy.size(), 10000);
const QPoint step = QPoint(25, 25);
QPoint cursorPos = view.pos() - step;
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-20 20:03:45 +0000