diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST index 57902885071fab3ce9d7c220ab56253088c32914..010b014d7daa319cab70b00c99c8a048cc4f81dd 100644 --- a/tests/auto/quick/qmltests/BLACKLIST +++ b/tests/auto/quick/qmltests/BLACKLIST @@ -20,8 +20,5 @@ linux [WebEngineViewSingleFileUpload::test_acceptSingleFileSelection] * -[WebViewFindText::test_findTextInterruptedByLoad] -linux - [WebEngineViewLoadProgress::test_loadProgress] osx diff --git a/tests/auto/quick/qmltests/data/tst_findText.qml b/tests/auto/quick/qmltests/data/tst_findText.qml index f8730ca7b502b99df3df0a4d8d2bb532442f9f3f..dfcfd586f9d7703f6f30983f6cb995d0b5277fa9 100644 --- a/tests/auto/quick/qmltests/data/tst_findText.qml +++ b/tests/auto/quick/qmltests/data/tst_findText.qml @@ -57,7 +57,7 @@ TestWebEngineView { runJavaScript("document.body.innerHTML", function(result) { bodyInnerHTML = result; }); - tryVerify(function() { return bodyInnerHTML != undefined; }); + tryVerify(function() { return bodyInnerHTML != undefined; }, 20000); return bodyInnerHTML; } @@ -66,7 +66,7 @@ TestWebEngineView { runJavaScript("document.getElementById('list').getElementsByTagName('li')[" + index + "].innerText;", function(result) { listItemText = result; }); - tryVerify(function() { return listItemText != undefined; }); + tryVerify(function() { return listItemText != undefined; }, 20000); return listItemText; } @@ -82,9 +82,9 @@ TestWebEngineView { var itemIndex; runJavaScript(script, function(result) { itemIndex = result; }); - tryVerify(function() { return itemIndex != undefined; }); + tryVerify(function() { return itemIndex != undefined; }, 20000); // Make sure the DOM is up-to-date. - tryVerify(function() { return getListItemText(itemIndex).length == text.length; }); + tryVerify(function() { return getListItemText(itemIndex).length == text.length; }, 20000); } function test_findText() { @@ -176,7 +176,7 @@ TestWebEngineView { verify(findFailed) runJavaScript("document.body.innerHTML = 'blahellobla'"); - tryVerify(function() { return getBodyInnerHTML() == "blahellobla"; }); + tryVerify(function() { return getBodyInnerHTML() == "blahellobla"; }, 20000); webEngineView.clear() webEngineView.findText("hello", findFlags, webEngineView.findTextCallback) @@ -213,7 +213,7 @@ TestWebEngineView { // The callback is not supposed to be called, see QTBUG-61506. // Check whether the callback was called (-1 = no, other values = yes). - tryVerify(function() { return webEngineView.matchCount == -1; }); + tryVerify(function() { return webEngineView.matchCount == -1; }, 20000); } } }