Skip to content

Attempt to make macOS CI more robust #2310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 27, 2024
Merged

Attempt to make macOS CI more robust #2310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
799b209
Attempt to make macOS CI more robust
pokey Apr 26, 2024
9a844e8
Merge branch 'main' into pokey/attempt-to-make-macos-ci-more-robust
pokey Apr 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cursorless-vscode-e2e/src/suite/scopeProvider/assertCalledWithScopeInfo.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export async function assertCalledWithScopeInfo<T extends ScopeTypeInfo>(
fake: sinon.SinonSpy<[scopeInfos: T[]], void>,
...expectedScopeInfos: T[]
) {
await sleepWithBackoff(25);
await sleepWithBackoff(100);
sinon.assert.called(fake);

for (const expectedScopeInfo of expectedScopeInfos) {
Expand All @@ -26,7 +26,7 @@ export async function assertCalledWithoutScopeInfo<T extends ScopeTypeInfo>(
fake: sinon.SinonSpy<[scopeInfos: T[]], void>,
...scopeTypes: ScopeType[]
) {
await sleepWithBackoff(25);
await sleepWithBackoff(100);
sinon.assert.called(fake);

for (const scopeType of scopeTypes) {
Expand Down
3 changes: 0 additions & 3 deletions packages/cursorless-vscode-e2e/src/suite/scopeProvider/runCustomRegexScopeInfoTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import { getCursorlessApi, openNewEditor } from "@cursorless/vscode-common";
import { stat, unlink, writeFile } from "fs/promises";
import * as sinon from "sinon";
import { commands } from "vscode";
import { sleepWithBackoff } from "../../endToEndTestSetup";
import {
assertCalledWithScopeInfo,
assertCalledWithoutScopeInfo,
Expand All @@ -35,14 +34,12 @@ export async function runCustomRegexScopeInfoTest() {
cursorlessTalonStateJsonPath,
JSON.stringify(spokenFormJsonContents),
);
await sleepWithBackoff(50);
await assertCalledWithScopeInfo(fake, unsupported);

await openNewEditor(contents);
await assertCalledWithScopeInfo(fake, present);

await unlink(cursorlessTalonStateJsonPath);
await sleepWithBackoff(100);
await assertCalledWithoutScopeInfo(fake, scopeType);
} finally {
disposable.dispose();
Expand Down
3 changes: 0 additions & 3 deletions packages/cursorless-vscode-e2e/src/suite/scopeProvider/runCustomSpokenFormScopeInfoTest.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { ScopeTypeInfo, sleep } from "@cursorless/common";
import * as sinon from "sinon";
import { assertCalledWithScopeInfo } from "./assertCalledWithScopeInfo";
import { stat, unlink, writeFile } from "fs/promises";
import { sleepWithBackoff } from "../../endToEndTestSetup";

/**
* Tests that the scope provider correctly reports custom spoken forms
Expand Down Expand Up @@ -31,7 +30,6 @@ export async function runCustomSpokenFormScopeInfoTest() {
cursorlessTalonStateJsonPath,
JSON.stringify(spokenFormJsonContents),
);
await sleepWithBackoff(50);
await assertCalledWithScopeInfo(
fake,
subjectCustom,
Expand All @@ -43,7 +41,6 @@ export async function runCustomSpokenFormScopeInfoTest() {
);

await unlink(cursorlessTalonStateJsonPath);
await sleepWithBackoff(100);
await assertCalledWithScopeInfo(
fake,
roundStandard,
Expand Down