Fix safeDisposeTerminal tests

This commit is contained in:
Daniel Imms 2021-12-08 06:26:08 -08:00
parent 18cba4882d
commit 36687f38cb

View file

@ -4,6 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import { fail } from 'assert';
import { Emitter } from 'vs/base/common/event';
import { TerminalLocation } from 'vs/platform/terminal/common/terminal';
import { TerminalService } from 'vs/workbench/contrib/terminal/browser/terminalService';
import { TestInstantiationService } from 'vs/platform/instantiation/test/common/instantiationServiceMock';
@ -55,13 +56,20 @@ suite('Workbench - TerminalService', () => {
instantiationService.stub(ITerminalService, terminalService);
});
suite.skip('safeDisposeTerminal', () => {
suite('safeDisposeTerminal', () => {
let onExitEmitter: Emitter<number | undefined>;
setup(() => {
onExitEmitter = new Emitter<number | undefined>();
});
test('should not show prompt when confirmOnKill is never', async () => {
setConfirmOnKill(configurationService, 'never');
await new Promise<void>(r => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Editor,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -69,6 +77,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -79,6 +88,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Editor,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -87,6 +97,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Editor,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -97,6 +108,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -109,6 +121,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -117,6 +130,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -132,6 +146,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -144,6 +159,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -152,6 +168,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: false,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});
@ -167,6 +184,7 @@ suite('Workbench - TerminalService', () => {
terminalService.safeDisposeTerminal({
target: TerminalLocation.Panel,
hasChildProcesses: true,
onExit: onExitEmitter.event,
dispose: () => r()
} as Partial<ITerminalInstance> as any);
});