Skip to content

Commit 73d78ef

Browse files
committed
fix(test): tighten remote-agent wake gating
Retry relative-only horizontal wheel input after USB re-enumeration and require system 0.2.9 for S3 wake tests so hardware-dependent cases only run where the wake path is expected to work.
1 parent 1c478b1 commit 73d78ef

1 file changed

Lines changed: 18 additions & 9 deletions

File tree

ui/e2e/remote-agent/ra-all.spec.ts

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1385,13 +1385,22 @@ test.describe("Remote Host Agent", () => {
13851385
expect(vWheel.length, "Vertical wheel in relative-only mode").toBeGreaterThan(0);
13861386
expect(vWheel[0].value).not.toBe(0);
13871387

1388-
// Horizontal scroll
1389-
await agent!.clearMouseEvents();
1390-
await callJsonRpc(sharedPage, "wheelReport", { wheelY: 0, wheelX: 1 });
1391-
const hWheel = await agent!.waitForMouseEvent(
1392-
ev => ev.type === "mouse_move_rel" && ev.code === REL_HWHEEL,
1393-
3000,
1394-
);
1388+
// Horizontal scroll can hit the same post-re-enumeration race as vertical.
1389+
const hDeadline = Date.now() + 10000;
1390+
let hWheel: RAMouseEvent[] = [];
1391+
while (Date.now() < hDeadline) {
1392+
await agent!.clearMouseEvents();
1393+
await callJsonRpc(sharedPage, "wheelReport", { wheelY: 0, wheelX: 1 });
1394+
try {
1395+
hWheel = await agent!.waitForMouseEvent(
1396+
ev => ev.type === "mouse_move_rel" && ev.code === REL_HWHEEL,
1397+
2000,
1398+
);
1399+
break;
1400+
} catch {
1401+
/* agent not ready yet, retry */
1402+
}
1403+
}
13951404
expect(hWheel.length, "Horizontal wheel in relative-only mode").toBeGreaterThan(0);
13961405
expect(hWheel[0].value).not.toBe(0);
13971406
} finally {
@@ -2281,7 +2290,7 @@ test.describe("Remote Host Agent", () => {
22812290
appVersion: string;
22822291
systemVersion: string;
22832292
};
2284-
if (!semverGte(localVersion.systemVersion, "0.2.8")) {
2293+
if (!semverGte(localVersion.systemVersion, "0.2.9")) {
22852294
test.skip(true, `S3 wake requires system >= 0.2.8 (got ${localVersion.systemVersion})`);
22862295
return;
22872296
}
@@ -2389,7 +2398,7 @@ test.describe("Remote Host Agent", () => {
23892398
appVersion: string;
23902399
systemVersion: string;
23912400
};
2392-
if (!semverGte(localVersion.systemVersion, "0.2.8")) {
2401+
if (!semverGte(localVersion.systemVersion, "0.2.9")) {
23932402
test.skip(true, `S3 wake requires system >= 0.2.8 (got ${localVersion.systemVersion})`);
23942403
return;
23952404
}

0 commit comments

Comments
 (0)