Skip to content

Commit 1ede9a1

Browse files
stamphoalcroito
authored andcommitted
Speculative fix of user script QML tests
The sequence of the titleChanged and loadingChanged signals is not guaranteed. Wait for both of them to avoid flaky behavior. Task-number: QTBUG-58940 Change-Id: I981cd20f6535187fa0f8144db0084c8bb64ab41c Reviewed-by: Allan Sandfeld Jensen <[email protected]> (cherry picked from commit 25b50de)
1 parent 9464e7f commit 1ede9a1

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

tests/auto/quick/qmltests/data/tst_userScripts.qml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -82,31 +82,31 @@ Item {
8282
function test_oneScript() {
8383
webEngineView.url = Qt.resolvedUrl("test1.html");
8484
webEngineView.waitForLoadSucceeded();
85-
compare(webEngineView.title, "Test page 1");
85+
tryCompare(webEngineView, "title", "Test page 1");
8686

8787
webEngineView.userScripts = [ changeDocumentTitleScript ];
8888
compare(webEngineView.title, "Test page 1");
8989

9090
webEngineView.reload();
9191
webEngineView.waitForLoadSucceeded();
92-
compare(webEngineView.title, "New title");
92+
tryCompare(webEngineView, "title", "New title");
9393

9494
webEngineView.url = Qt.resolvedUrl("test2.html");
9595
webEngineView.waitForLoadSucceeded();
96-
compare(webEngineView.title, "New title");
96+
tryCompare(webEngineView, "title", "New title");
9797

9898
webEngineView.userScripts = [];
9999
compare(webEngineView.title, "New title");
100100

101101
webEngineView.reload();
102102
webEngineView.waitForLoadSucceeded();
103-
compare(webEngineView.title, "Test page with huge link area");
103+
tryCompare(webEngineView, "title", "Test page with huge link area");
104104
}
105105

106106
function test_twoScripts() {
107107
webEngineView.url = Qt.resolvedUrl("test1.html");
108108
webEngineView.waitForLoadSucceeded();
109-
compare(webEngineView.title, "Test page 1");
109+
tryCompare(webEngineView, "title", "Test page 1");
110110

111111
webEngineView.userScripts = [ changeDocumentTitleScript, appendDocumentTitleScript ];
112112

@@ -134,22 +134,22 @@ Item {
134134
function test_setUserScriptsConditionally() {
135135
webEngineViewWithConditionalUserScripts.url = Qt.resolvedUrl("test1.html");
136136
webEngineViewWithConditionalUserScripts.waitForLoadSucceeded();
137-
compare(webEngineViewWithConditionalUserScripts.title, "New title");
137+
tryCompare(webEngineViewWithConditionalUserScripts, "title", "New title");
138138

139139
webEngineViewWithConditionalUserScripts.url = Qt.resolvedUrl("test2.html");
140140
webEngineViewWithConditionalUserScripts.waitForLoadSucceeded();
141-
compare(webEngineViewWithConditionalUserScripts.title, "Test page with huge link area with appendix");
141+
tryCompare(webEngineViewWithConditionalUserScripts, "title", "Test page with huge link area with appendix");
142142

143143
webEngineViewWithConditionalUserScripts.url = Qt.resolvedUrl("test3.html");
144144
webEngineViewWithConditionalUserScripts.waitForLoadSucceeded();
145-
compare(webEngineViewWithConditionalUserScripts.title, "Test page 3");
145+
tryCompare(webEngineViewWithConditionalUserScripts, "title", "Test page 3");
146146
}
147147

148148
function test_bigScript() {
149149
webEngineView.userScripts = [ bigUserScript ];
150150
webEngineView.url = Qt.resolvedUrl("test1.html");
151151
webEngineView.waitForLoadSucceeded();
152-
compare(webEngineView.title, "Big user script changed title");
152+
tryCompare(webEngineView , "title", "Big user script changed title");
153153
}
154154
}
155155
}

0 commit comments

Comments
 (0)