maxmustermann/vscode
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make terminal test less strict

Browse source 
Fixes #117371
This commit is contained in:
Daniel Imms 2021-02-24 09:41:24 -08:00
parent 8042e9b5d5
commit faccfff275
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
extensions/vscode-api-tests/src/singlefolder-tests/terminal.test.ts
View file

@ -60,8 +60,9 @@ import { assertNoRpc } from '../utils';
test('echo works in the default shell', async () => {
const terminal = await new Promise<Terminal>(r => {
disposables.push(window.onDidOpenTerminal(t => {
strictEqual(terminal, t);
r(terminal);
if (t === terminal) {
r(terminal);
}
}));
// Use a single character to avoid winpty/conpty issues with injected sequences
const terminal = window.createTerminal({
@ -73,10 +74,11 @@ import { assertNoRpc } from '../utils';
let data = '';
await new Promise<void>(r => {
disposables.push(window.onDidWriteTerminalData(e => {
strictEqual(terminal, e.terminal);
data += e.data;
if (data.indexOf('`') !== 0) {
r();
if (e.terminal === terminal) {
data += e.data;
if (data.indexOf('`') !== 0) {
r();
}
}
}));
// Print an environment variable value so the echo statement doesn't get matched