Skip to content
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.

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

Fix flaky ADS unit tests by using DOM rendering #23770

Merged
merged 17 commits into from
Jul 11, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,21 @@ export class TestConfigurationService implements IConfigurationService {
readonly onDidChangeConfiguration = this.onDidChangeConfigurationEmitter.event;

constructor(configuration?: any) {
// {{SQL CAROB EDIT}} - START
lewis-sanchez marked this conversation as resolved.
Show resolved Hide resolved
// Ensures that all configuration services use the DOM renderer.
lewis-sanchez marked this conversation as resolved.
Show resolved Hide resolved
if (configuration) {
if (configuration.integrated) {
configuration.integrated.gpuAcceleration = 'off';
}
else {
configuration.integrated = { gpuAcceleration: 'off' };
}
}
else {
configuration = { integrated: { gpuAcceleration: 'off' } };
}
// {{SQL CAROB EDIT}} - END

this.configuration = configuration || Object.create(null);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export class TestExperimentService extends ExperimentService {
}
}

suite.skip('Experiment Service', () => { // {{SQL CARBON EDIT}} Tests are flaky, and have been removed in VS Code so disabling until we catch up
suite('Experiment Service', () => {
let instantiationService: TestInstantiationService;
let testConfigurationService: TestConfigurationService;
let testObject: ExperimentService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const defaultTerminalConfig: Partial<ITerminalConfiguration> = {
unicodeVersion: '6'
};

suite.skip('Buffer Content Tracker', () => { // {{SQL CARBON EDIT}} skip failing suite
suite('Buffer Content Tracker', () => {
let instantiationService: TestInstantiationService;
let configurationService: TestConfigurationService;
let themeService: TestThemeService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ suite('TerminalLinkManager', () => {
} as Partial<ITerminalCapabilityStore> as any, instantiationService.createInstance(TerminalLinkResolver));
});

suite.skip('getLinks and open recent link', () => { // {{SQL CARBON EDIT}} skip failing suite
suite('getLinks and open recent link', () => {
test('should return no links', async () => {
const links = await linkManager.getLinks();
equals(links.webLinks, []);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices
import { TestExtensionService } from 'vs/workbench/test/common/workbenchTestServices';


suite.skip('Getting Started Markdown Renderer', () => { // {{SQL CARBON EDIT}} - disable suite
suite('Getting Started Markdown Renderer', () => {
test('renders theme picker markdown with images', async () => {
const fileService = new TestFileService();
const languageService = new LanguageService();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class ConfigurationCache implements IConfigurationCache {
async remove({ type, key }: ConfigurationKey): Promise<void> { this.cache.delete(`${type}:${key}`); }
}

suite.skip('DefaultConfiguration', () => { // {{SQL CARBON EDIT}} skip failing suite
suite('DefaultConfiguration', () => {

const configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
const cacheKey: ConfigurationKey = { type: 'defaults', key: 'configurationDefaultsOverrides' };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ConfigurationCache implements IConfigurationCache {
async remove(): Promise<void> { }
}

suite.skip('ConfigurationEditing', () => { // {{SQL CARBON EDIT}} skip suite
suite('ConfigurationEditing', () => {

let instantiationService: TestInstantiationService;
let userDataProfileService: IUserDataProfileService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1518,7 +1518,7 @@ suite.skip('WorkspaceConfigurationService - Folder', () => { // {{SQL CARBON EDI
}));
});

suite.skip('WorkspaceConfigurationService - Profiles', () => { // {{SQL CARBON EDIT}} - skip failing suite
suite('WorkspaceConfigurationService - Profiles', () => {

let testObject: WorkspaceService, workspaceService: WorkspaceService, fileService: IFileService, environmentService: IBrowserWorkbenchEnvironmentService, userDataProfileService: IUserDataProfileService, instantiationService: TestInstantiationService;
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
Expand Down Expand Up @@ -2489,7 +2489,7 @@ suite.skip('WorkspaceConfigurationService-Multiroot', () => { // {{SQL CARBON ED

});

suite.skip('WorkspaceConfigurationService - Remote Folder', () => { // {{SQL CARBON EDIT}} - disable suite
suite('WorkspaceConfigurationService - Remote Folder', () => {

let testObject: WorkspaceService, folder: URI,
machineSettingsResource: URI, remoteSettingsResource: URI, fileSystemProvider: InMemoryFileSystemProvider, resolveRemoteEnvironment: () => void,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const nullContext = {
getExecPath: () => undefined
};

suite.skip('Configuration Resolver Service', () => { // {{SQL CARBON EDIT}} - skip failing suite
suite('Configuration Resolver Service', () => {
let configurationResolverService: IConfigurationResolverService | null;
const envVariables: { [key: string]: string } = { key1: 'Value for key1', key2: 'Value for key2' };
// let environmentService: MockWorkbenchEnvironmentService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
import { IEditorResolverService, ResolvedStatus, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
import { createEditorPart, ITestInstantiationService, TestFileEditorInput, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';

suite.skip('EditorResolverService', () => { // {{SQL CARBON EDIT}} - disable suite
suite('EditorResolverService', () => {

const TEST_EDITOR_INPUT_ID = 'testEditorInputForEditorResolverService';
const disposables = new DisposableStore();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
}
}

suite.skip('ExtensionEnablementService Test', () => {
suite('ExtensionEnablementService Test', () => {

let instantiationService: TestInstantiationService;
let testObject: IWorkbenchExtensionEnablementService;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ suite('BrowserExtensionService', () => {
});
});

suite.skip('ExtensionService', () => { // {{SQL CARBON EDIT}} - disable failing suite
suite('ExtensionService', () => {

class MyTestExtensionService extends AbstractExtensionService {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';

suite.skip('HistoryService', function () { // {{SQL CARBON EDIT}} skip suite
suite('HistoryService', function () {

const TEST_EDITOR_ID = 'MyTestEditorForEditorHistory';
const TEST_EDITOR_INPUT_ID = 'testEditorInputForHistoyService';
Expand Down
Loading