Skip to content

Commit 14a6bb1

Browse files
cbiesingerchromium-wpt-export-bot
authored andcommitted
[FedCM] Ignore unexpected messages
Webdriver internally uses testdriver-complete messages. We should ignore them when waiting for messages from our iframe. This fixes the three changed tests on wpt.fyi. Bug: 331237776 Change-Id: Id274b724d5974b646f1ca4c389820befc9072109 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5721452 Reviewed-by: Nicolás Peña <[email protected]> Commit-Queue: Christian Biesinger <[email protected]> Auto-Submit: Christian Biesinger <[email protected]> Cr-Commit-Position: refs/heads/main@{#1330510}
1 parent fef62c8 commit 14a6bb1

File tree

3 files changed

+15
-3
lines changed

3 files changed

+15
-3
lines changed

fedcm/fedcm-authz/fedcm-userinfo-after-resolve.https.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@
2121
iframe.src = iframeUrl;
2222
iframe.allow = "identity-credentials-get";
2323
document.body.appendChild(iframe);
24-
const message = await messageWatcher.wait_for("message");
24+
let message = null;
25+
// Ignore internal "testdriver-complete" messages.
26+
do {
27+
message = await messageWatcher.wait_for("message");
28+
} while (!("result" in message.data));
2529
return message.data;
2630
}
2731

fedcm/fedcm-pending-userinfo.https.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
iframe.src = iframeUrl;
2121
iframe.allow = "identity-credentials-get";
2222
document.body.appendChild(iframe);
23-
const message = await messageWatcher.wait_for("message");
23+
let message = null;
24+
// Ignore internal "testdriver-complete" messages.
25+
do {
26+
message = await messageWatcher.wait_for("message");
27+
} while (typeof message.data !== "string");
2428
return message.data;
2529
}
2630

fedcm/fedcm-userinfo.https.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020
iframe.src = iframeUrl;
2121
iframe.allow = "identity-credentials-get";
2222
document.body.appendChild(iframe);
23-
const message = await messageWatcher.wait_for("message");
23+
let message = null;
24+
// Ignore internal "testdriver-complete" messages.
25+
do {
26+
message = await messageWatcher.wait_for("message");
27+
} while (!("result" in message.data));
2428
return message.data;
2529
}
2630

0 commit comments

Comments
 (0)