mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 10:58:30 -05:00
* Makes use of xvfb to run unit tests * Restore test script as before, but with xvfb * Use same command that worked in CLI * Add --build CLI arg * Add coverage arg * Revert change to core unit test script * Reset core unit tests script in linux pipeline * Revert "Skip flaky vscode test suites (#23535)" This reverts commit882bdb3aab. * Revert "Disable failing vscode test suite (#23539)" This reverts commit562a0ce595. * Revert "Disable vscode remote configuration suite (#23545)" This reverts commit40fa1cebd8. * Revert "Disable editor resolver service test suite (#23550)" This reverts commitcd68dca844. * Revert "Disable upstream extension enablement suite (#23557)" This reverts commitfaf3c6976e. * Revert "Skip a few more suites impacted by xterm issue (#23589)" This reverts commit1662cedf17. # Conflicts: # src/vs/workbench/contrib/experiments/test/electron-sandbox/experimentService.test.ts * Use DOM Renderer for tests * Remove extra whitespace * Update comment
This commit is contained in:
@@ -18,6 +18,23 @@ export class TestConfigurationService implements IConfigurationService {
|
|||||||
readonly onDidChangeConfiguration = this.onDidChangeConfigurationEmitter.event;
|
readonly onDidChangeConfiguration = this.onDidChangeConfigurationEmitter.event;
|
||||||
|
|
||||||
constructor(configuration?: any) {
|
constructor(configuration?: any) {
|
||||||
|
// {{SQL CARBON EDIT}} - START
|
||||||
|
// Ensures that all configuration services use the DOM renderer. There's an issue
|
||||||
|
// with GPU rendering that is causing unit tests to be flaky and obscuring true failing tests.
|
||||||
|
// This is a temporary fix and should be removed once xterm GPU rendering is working again.
|
||||||
|
if (configuration) {
|
||||||
|
if (configuration.integrated) {
|
||||||
|
configuration.integrated.gpuAcceleration = 'off';
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
configuration.integrated = { gpuAcceleration: 'off' };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
configuration = { integrated: { gpuAcceleration: 'off' } };
|
||||||
|
}
|
||||||
|
// {{SQL CARBON EDIT}} - END
|
||||||
|
|
||||||
this.configuration = configuration || Object.create(null);
|
this.configuration = configuration || Object.create(null);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -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 instantiationService: TestInstantiationService;
|
||||||
let testConfigurationService: TestConfigurationService;
|
let testConfigurationService: TestConfigurationService;
|
||||||
let testObject: ExperimentService;
|
let testObject: ExperimentService;
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ const defaultTerminalConfig: Partial<ITerminalConfiguration> = {
|
|||||||
unicodeVersion: '6'
|
unicodeVersion: '6'
|
||||||
};
|
};
|
||||||
|
|
||||||
suite.skip('Buffer Content Tracker', () => { // {{SQL CARBON EDIT}} skip failing suite
|
suite('Buffer Content Tracker', () => {
|
||||||
let instantiationService: TestInstantiationService;
|
let instantiationService: TestInstantiationService;
|
||||||
let configurationService: TestConfigurationService;
|
let configurationService: TestConfigurationService;
|
||||||
let themeService: TestThemeService;
|
let themeService: TestThemeService;
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ suite('TerminalLinkManager', () => {
|
|||||||
} as Partial<ITerminalCapabilityStore> as any, instantiationService.createInstance(TerminalLinkResolver));
|
} 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 () => {
|
test('should return no links', async () => {
|
||||||
const links = await linkManager.getLinks();
|
const links = await linkManager.getLinks();
|
||||||
equals(links.webLinks, []);
|
equals(links.webLinks, []);
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ import { TestFileService } from 'vs/workbench/test/browser/workbenchTestServices
|
|||||||
import { TestExtensionService } from 'vs/workbench/test/common/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 () => {
|
test('renders theme picker markdown with images', async () => {
|
||||||
const fileService = new TestFileService();
|
const fileService = new TestFileService();
|
||||||
const languageService = new LanguageService();
|
const languageService = new LanguageService();
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ class ConfigurationCache implements IConfigurationCache {
|
|||||||
async remove({ type, key }: ConfigurationKey): Promise<void> { this.cache.delete(`${type}:${key}`); }
|
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 configurationRegistry = Registry.as<IConfigurationRegistry>(Extensions.Configuration);
|
||||||
const cacheKey: ConfigurationKey = { type: 'defaults', key: 'configurationDefaultsOverrides' };
|
const cacheKey: ConfigurationKey = { type: 'defaults', key: 'configurationDefaultsOverrides' };
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ class ConfigurationCache implements IConfigurationCache {
|
|||||||
async remove(): Promise<void> { }
|
async remove(): Promise<void> { }
|
||||||
}
|
}
|
||||||
|
|
||||||
suite.skip('ConfigurationEditing', () => { // {{SQL CARBON EDIT}} skip suite
|
suite('ConfigurationEditing', () => {
|
||||||
|
|
||||||
let instantiationService: TestInstantiationService;
|
let instantiationService: TestInstantiationService;
|
||||||
let userDataProfileService: IUserDataProfileService;
|
let userDataProfileService: IUserDataProfileService;
|
||||||
|
|||||||
@@ -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;
|
let testObject: WorkspaceService, workspaceService: WorkspaceService, fileService: IFileService, environmentService: IBrowserWorkbenchEnvironmentService, userDataProfileService: IUserDataProfileService, instantiationService: TestInstantiationService;
|
||||||
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
|
const configurationRegistry = Registry.as<IConfigurationRegistry>(ConfigurationExtensions.Configuration);
|
||||||
@@ -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,
|
let testObject: WorkspaceService, folder: URI,
|
||||||
machineSettingsResource: URI, remoteSettingsResource: URI, fileSystemProvider: InMemoryFileSystemProvider, resolveRemoteEnvironment: () => void,
|
machineSettingsResource: URI, remoteSettingsResource: URI, fileSystemProvider: InMemoryFileSystemProvider, resolveRemoteEnvironment: () => void,
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ const nullContext = {
|
|||||||
getExecPath: () => undefined
|
getExecPath: () => undefined
|
||||||
};
|
};
|
||||||
|
|
||||||
suite.skip('Configuration Resolver Service', () => { // {{SQL CARBON EDIT}} - skip failing suite
|
suite('Configuration Resolver Service', () => {
|
||||||
let configurationResolverService: IConfigurationResolverService | null;
|
let configurationResolverService: IConfigurationResolverService | null;
|
||||||
const envVariables: { [key: string]: string } = { key1: 'Value for key1', key2: 'Value for key2' };
|
const envVariables: { [key: string]: string } = { key1: 'Value for key1', key2: 'Value for key2' };
|
||||||
// let environmentService: MockWorkbenchEnvironmentService;
|
// let environmentService: MockWorkbenchEnvironmentService;
|
||||||
|
|||||||
@@ -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 { IEditorResolverService, ResolvedStatus, RegisteredEditorPriority } from 'vs/workbench/services/editor/common/editorResolverService';
|
||||||
import { createEditorPart, ITestInstantiationService, TestFileEditorInput, TestServiceAccessor, workbenchInstantiationService } from 'vs/workbench/test/browser/workbenchTestServices';
|
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 TEST_EDITOR_INPUT_ID = 'testEditorInputForEditorResolverService';
|
||||||
const disposables = new DisposableStore();
|
const disposables = new DisposableStore();
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ export class TestExtensionEnablementService extends ExtensionEnablementService {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suite.skip('ExtensionEnablementService Test', () => {
|
suite('ExtensionEnablementService Test', () => {
|
||||||
|
|
||||||
let instantiationService: TestInstantiationService;
|
let instantiationService: TestInstantiationService;
|
||||||
let testObject: IWorkbenchExtensionEnablementService;
|
let testObject: IWorkbenchExtensionEnablementService;
|
||||||
|
|||||||
@@ -128,7 +128,7 @@ suite('BrowserExtensionService', () => {
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
suite.skip('ExtensionService', () => { // {{SQL CARBON EDIT}} - disable failing suite
|
suite('ExtensionService', () => {
|
||||||
|
|
||||||
class MyTestExtensionService extends AbstractExtensionService {
|
class MyTestExtensionService extends AbstractExtensionService {
|
||||||
|
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ import { EditorPane } from 'vs/workbench/browser/parts/editor/editorPane';
|
|||||||
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
|
import { TestConfigurationService } from 'vs/platform/configuration/test/common/testConfigurationService';
|
||||||
import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
|
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_ID = 'MyTestEditorForEditorHistory';
|
||||||
const TEST_EDITOR_INPUT_ID = 'testEditorInputForHistoyService';
|
const TEST_EDITOR_INPUT_ID = 'testEditorInputForHistoyService';
|
||||||
|
|||||||
Reference in New Issue
Block a user