Merge ~osomon/oxide:fix-test_NetworkCallbackEvents3_BeforeSendHeaders_subframe into oxide:master

Proposed by Olivier Tilloy
Status: Merged
Approved by: Chris Coulson
Approved revision: c92d8997ebc2ad6849a9aefd4f27ee3707b7bd6c
Merged at revision: c05c51d79a4d4ab18740e6542ddff02becd9b49c
Proposed branch: ~osomon/oxide:fix-test_NetworkCallbackEvents3_BeforeSendHeaders_subframe
Merge into: oxide:master
Diff against target: 16 lines (+3/-2)
1 file modified
qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml (+3/-2)
Reviewer Review Type Date Requested Status
Chris Coulson Approve
Review via email: mp+322630@code.launchpad.net

Commit message

Make test_NetworkCallbackEvents3_BeforeSendHeaders_subframe more robust by waiting for the contents of the iframe to be loaded.

To post a comment you must log in.
Revision history for this message
Chris Coulson (chrisccoulson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml b/qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml
2index cf7ee59..294330f 100644
3--- a/qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml
4+++ b/qt/tests/qmltests/api/tst_NetworkCallbackEvents.qml
5@@ -155,8 +155,9 @@ TestWebView {
6 { url: data.url.replace(/([^\?]+)/, "http://testsuite/get-headers.py"), method: "GET", requestCancelled: false, isMainFrame: false, hasUA: true, UA: "Oxide Test", hasFoo: false, Foo: "" }
7 ]);
8
9- var headers = JSON.parse(webView.getTestApiForFrame(webView.rootFrame.childFrames[0]).evaluateCode(
10- "return document.body.children[0].innerHTML", true));
11+ var testApi = webView.getTestApiForFrame(webView.rootFrame.childFrames[0]);
12+ verify(TestUtils.waitFor(function() { return testApi.evaluateCode("return document.body.children.length", true) == 1; }));
13+ var headers = JSON.parse(testApi.evaluateCode("return document.body.children[0].innerHTML", true));
14
15 compare(headers["user-agent"], data["User-Agent"]);
16 compare(headers["foo"], data["Foo"]);

Subscribers

People subscribed via source and target branches