Skip to content

Work around E2E test failure #13347

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 3 commits into from
Mar 7, 2025
Merged

Work around E2E test failure #13347

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fea98ea
Work around E2E test failure
Colengms Mar 6, 2025
71acc9d
Add missing await
Colengms Mar 6, 2025
93babff
Merge branch 'main' into coleng/fix_E2E_failure
Colengms Mar 6, 2025
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
10 changes: 7 additions & 3 deletions Extension/test/scenarios/MultirootDeadlockTest/tests/inlayhints.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ import { suite } from 'mocha';
import * as vscode from 'vscode';
import * as api from 'vscode-cpptools';
import * as apit from 'vscode-cpptools/out/testApi';
import { sleep } from '../../../../src/Utility/Async/sleep';
import { timeout } from '../../../../src/Utility/Async/timeout';
import * as testHelpers from '../../../common/testHelpers';

suite("[Inlay hints test]", function(): void {
suite("[Inlay hints test]", function (): void {
// Settings
const inlayHintSettings: vscode.WorkspaceConfiguration = vscode.workspace.getConfiguration('C_Cpp.inlayHints');
const autoDeclarationTypesEnabled: string = "autoDeclarationTypes.enabled";
Expand All @@ -41,7 +42,7 @@ suite("[Inlay hints test]", function(): void {
const fileUri: vscode.Uri = vscode.Uri.file(filePath);
const disposables: vscode.Disposable[] = [];

suiteSetup(async function(): Promise<void> {
suiteSetup(async function (): Promise<void> {
await testHelpers.activateCppExtension();

const cpptools = await apit.getCppToolsTestApi(api.Version.latest) ?? assert.fail("Could not get cpptools test api");
Expand Down Expand Up @@ -74,7 +75,7 @@ suite("[Inlay hints test]", function(): void {
await useDefaultSettings();
});

suiteTeardown(async function(): Promise<void> {
suiteTeardown(async function (): Promise<void> {
await restoreOriginalSettings();
disposables.forEach(d => d.dispose());
});
Expand Down Expand Up @@ -298,6 +299,9 @@ suite("[Inlay hints test]", function(): void {
await inlayHintSettings.update(inlayHintSetting, valueNew, vscode.ConfigurationTarget.Global);
const valueAfterChange: any = inlayHintSettings.inspect(inlayHintSetting)!.globalValue;
assert.strictEqual(valueAfterChange, valueNew, `Unable to change setting: ${inlayHintSetting}`);
// TODO: We need a way to synchronize with native process having completely processed the setting change
// and any changes in behavior being fully applied.
await sleep(5000);
}
}

Expand Down