summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-09-26 16:41:12 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2016-09-26 20:51:36 +0000
commit0eb9a4233d7ec6bbcf66944927eb6198b3f20c90 (patch)
tree4ca3a287733bed6c3c80ed1cab1684f4c07503d8 /tests/auto
parenta8eb38eb4124da6af7815fd3720718464745f152 (diff)
Speculative fix of test_bigScript
Wait asynchronously on the title change. Change-Id: I4e3826c5206e1a1a77c095c3226406d4eee64eba Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/quick/qmltests/BLACKLIST3
-rw-r--r--tests/auto/quick/qmltests/data/tst_userScripts.qml3
2 files changed, 1 insertions, 5 deletions
diff --git a/tests/auto/quick/qmltests/BLACKLIST b/tests/auto/quick/qmltests/BLACKLIST
index 85dc845e4..e271f59a6 100644
--- a/tests/auto/quick/qmltests/BLACKLIST
+++ b/tests/auto/quick/qmltests/BLACKLIST
@@ -22,8 +22,5 @@ windows
[WebEngineViewUnhandledKeyEventPropagation::test_keyboardModifierMapping]
windows
-[WebEngineViewUserScripts::test_bigScript]
-windows
-
[WebEngineViewSource::test_viewSourceURL]
windows
diff --git a/tests/auto/quick/qmltests/data/tst_userScripts.qml b/tests/auto/quick/qmltests/data/tst_userScripts.qml
index 92ae71f0b..a6249d128 100644
--- a/tests/auto/quick/qmltests/data/tst_userScripts.qml
+++ b/tests/auto/quick/qmltests/data/tst_userScripts.qml
@@ -153,8 +153,7 @@ Item {
function test_bigScript() {
webEngineView.userScripts = [ bigUserScript ];
webEngineView.url = Qt.resolvedUrl("test1.html");
- webEngineView.waitForLoadSucceeded();
- compare(webEngineView.title, "Big user script changed title");
+ tryCompare(webEngineView , "title", "Big user script changed title");
}
function test_parseMetadataHeader() {