Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-20 16:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move other extension terminal tests to async await

Browse Source 
Part of #137155
This commit is contained in:
Daniel Imms
2021-11-14 23:53:12 -08:00
parent 03a844a2e5
commit b934d09346
1 changed files with 90 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

210
extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
View File

@@ -28,7 +28,7 @@ import { assertNoRpc } from '../utils';
await config.update('environmentChangesRelaunch', false, ConfigurationTarget.Global);
});
suite.only('Terminal', () => {
suite('Terminal', () => {
let disposables: Disposable[] = [];
teardown(() => {
@@ -425,23 +425,24 @@ import { assertNoRpc } from '../utils';
});
suite('Extension pty terminals', () => {
test('should fire onDidOpenTerminal and onDidCloseTerminal', (done) => {
disposables.push(window.onDidOpenTerminal(term => {
try {
equal(term.name, 'c');
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(() => done()));
term.dispose();
}));
test('should fire onDidOpenTerminal and onDidCloseTerminal', async () => {
const pty: Pseudoterminal = {
onDidWrite: new EventEmitter<string>().event,
open: () => { },
close: () => { }
};
window.createTerminal({ name: 'c', pty });
const terminal = await new Promise<Terminal>(r => {
disposables.push(window.onDidOpenTerminal(t => {
if (t.name === 'c') {
r(t);
}
}));
window.createTerminal({ name: 'c', pty });
});
await new Promise<void>(r => {
disposables.push(window.onDidCloseTerminal(() => r()));
terminal.dispose();
});
});
// The below tests depend on global UI state and each other
@@ -500,13 +501,13 @@ import { assertNoRpc } from '../utils';
open: () => overrideDimensionsEmitter.fire({ columns: 10, rows: 5 }),
close: () => { }
};
const terminal = window.createTerminal({ name: 'foo', pty });
await new Promise<void>(r => {
const terminal = await new Promise<Terminal>(r => {
disposables.push(window.onDidOpenTerminal(t => {
if (t === terminal) {
r();
if (t === created) {
r(t);
}
}));
const created = window.createTerminal({ name: 'foo', pty });
});
await new Promise<void>(r => {
disposables.push(window.onDidChangeTerminalDimensions(e => {
@@ -524,26 +525,7 @@ import { assertNoRpc } from '../utils';
});
});
test('should change terminal name', (done) => {
disposables.push(window.onDidOpenTerminal(term => {
try {
equal(terminal, term);
equal(terminal.name, 'foo');
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
equal(terminal, t);
equal(terminal.name, 'bar');
} catch (e) {
done(e);
return;
}
done();
}));
}));
test('should change terminal name', async () => {
const changeNameEmitter = new EventEmitter<string>();
const closeEmitter = new EventEmitter<number | undefined>();
const pty: Pseudoterminal = {
@@ -556,29 +538,22 @@ import { assertNoRpc } from '../utils';
},
close: () => { }
};
const terminal = window.createTerminal({ name: 'foo', pty });
await new Promise<void>(r => {
disposables.push(window.onDidOpenTerminal(t1 => {
if (t1 === created) {
disposables.push(window.onDidCloseTerminal(t2 => {
if (t2 === created) {
strictEqual(t1.name, 'bar');
r();
}
}));
}
}));
const created = window.createTerminal({ name: 'foo', pty });
});
});
test('exitStatus.code should be set to the exit code (undefined)', (done) => {
disposables.push(window.onDidOpenTerminal(term => {
try {
equal(terminal, term);
equal(terminal.exitStatus, undefined);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
equal(terminal, t);
deepEqual(terminal.exitStatus, { code: undefined });
} catch (e) {
done(e);
return;
}
done();
}));
}));
test('exitStatus.code should be set to the exit code (undefined)', async () => {
const writeEmitter = new EventEmitter<string>();
const closeEmitter = new EventEmitter<number | undefined>();
const pty: Pseudoterminal = {
@@ -587,29 +562,23 @@ import { assertNoRpc } from '../utils';
open: () => closeEmitter.fire(undefined),
close: () => { }
};
const terminal = window.createTerminal({ name: 'foo', pty });
await new Promise<void>(r => {
disposables.push(window.onDidOpenTerminal(t1 => {
if (t1 === created) {
strictEqual(created.exitStatus, undefined);
disposables.push(window.onDidCloseTerminal(t2 => {
if (t2 === created) {
deepStrictEqual(created.exitStatus, { code: undefined });
r();
}
}));
}
}));
const created = window.createTerminal({ name: 'foo', pty });
});
});
test('exitStatus.code should be set to the exit code (zero)', (done) => {
disposables.push(window.onDidOpenTerminal(term => {
try {
equal(terminal, term);
equal(terminal.exitStatus, undefined);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
equal(terminal, t);
deepEqual(terminal.exitStatus, { code: 0 });
} catch (e) {
done(e);
return;
}
done();
}));
}));
test('exitStatus.code should be set to the exit code (zero)', async () => {
const writeEmitter = new EventEmitter<string>();
const closeEmitter = new EventEmitter<number | undefined>();
const pty: Pseudoterminal = {
@@ -618,29 +587,23 @@ import { assertNoRpc } from '../utils';
open: () => closeEmitter.fire(0),
close: () => { }
};
const terminal = window.createTerminal({ name: 'foo', pty });
await new Promise<void>(r => {
disposables.push(window.onDidOpenTerminal(t1 => {
if (t1 === created) {
strictEqual(created.exitStatus, undefined);
disposables.push(window.onDidCloseTerminal(t2 => {
if (t2 === created) {
deepStrictEqual(created.exitStatus, { code: 0 });
r();
}
}));
}
}));
const created = window.createTerminal({ name: 'foo', pty });
});
});
test('exitStatus.code should be set to the exit code (non-zero)', (done) => {
disposables.push(window.onDidOpenTerminal(term => {
try {
equal(terminal, term);
equal(terminal.exitStatus, undefined);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
equal(terminal, t);
deepEqual(terminal.exitStatus, { code: 22 });
} catch (e) {
done(e);
return;
}
done();
}));
}));
test('exitStatus.code should be set to the exit code (non-zero)', async () => {
const writeEmitter = new EventEmitter<string>();
const closeEmitter = new EventEmitter<number | undefined>();
const pty: Pseudoterminal = {
@@ -654,20 +617,23 @@ import { assertNoRpc } from '../utils';
},
close: () => { }
};
const terminal = window.createTerminal({ name: 'foo', pty });
await new Promise<void>(r => {
disposables.push(window.onDidOpenTerminal(t1 => {
if (t1 === created) {
strictEqual(created.exitStatus, undefined);
disposables.push(window.onDidCloseTerminal(t2 => {
if (t2 === created) {
deepStrictEqual(created.exitStatus, { code: 22 });
r();
}
}));
}
}));
const created = window.createTerminal({ name: 'foo', pty });
});
});
test('creationOptions should be set and readonly for ExtensionTerminalOptions terminals', (done) => {
disposables.push(window.onDidOpenTerminal(term => {
try {
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
}));
test('creationOptions should be set and readonly for ExtensionTerminalOptions terminals', async () => {
const writeEmitter = new EventEmitter<string>();
const pty: Pseudoterminal = {
onDidWrite: writeEmitter.event,
@@ -675,16 +641,20 @@ import { assertNoRpc } from '../utils';
close: () => { }
};
const options = { name: 'foo', pty };
const terminal = window.createTerminal(options);
try {
equal(terminal.name, 'foo');
await new Promise<void>(r => {
disposables.push(window.onDidOpenTerminal(term => {
if (term === terminal) {
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => r()));
}
}));
const terminal = window.createTerminal(options);
strictEqual(terminal.name, 'foo');
const terminalOptions = terminal.creationOptions as ExtensionTerminalOptions;
equal(terminalOptions.name, 'foo');
equal(terminalOptions.pty, pty);
strictEqual(terminalOptions.name, 'foo');
strictEqual(terminalOptions.pty, pty);
throws(() => terminalOptions.name = 'bad', 'creationOptions should be readonly at runtime');
} catch (e) {
done(e);
}
});
});
});