Return after done(e)

Part of #95945
This commit is contained in:
Daniel Imms
2020-04-23 07:27:29 -07:00
parent 78f299ee51
commit 84a884a97a

View File

@@ -27,6 +27,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
@@ -41,6 +42,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
let data = '';
disposables.push(window.onDidWriteTerminalData(e => {
@@ -48,6 +50,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal);
} catch (e) {
done(e);
return;
}
data += e.data;
if (data.indexOf(expected) !== 0) {
@@ -80,6 +83,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
@@ -93,12 +97,14 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.processId.then(id => {
try {
ok(id && id > 0);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
@@ -113,6 +119,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
@@ -122,6 +129,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.name, 'a');
} catch (e) {
done(e);
return;
}
});
@@ -131,6 +139,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
@@ -146,6 +155,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
throws(() => (<any>terminal.creationOptions).name = 'bad', 'creationOptions should be readonly at runtime');
} catch (e) {
done(e);
return;
}
});
@@ -155,6 +165,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(term.name, 'b');
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(() => done()));
terminal.dispose();
@@ -168,6 +179,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(term, terminal);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
@@ -263,6 +275,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
ok(window.terminals.indexOf(terminal) !== -1);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(() => {
// reg3.dispose();
@@ -360,6 +373,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(term.name, 'c');
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(() => done()));
term.dispose();
@@ -425,6 +439,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
term.show();
disposables.push(window.onDidChangeTerminalDimensions(e => {
@@ -440,6 +455,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(e.terminal, terminal);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(() => done()));
terminal.dispose();
@@ -464,6 +480,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.exitStatus, undefined);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
@@ -494,6 +511,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.exitStatus, undefined);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
@@ -524,6 +542,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal.exitStatus, undefined);
} catch (e) {
done(e);
return;
}
disposables.push(window.onDidCloseTerminal(t => {
try {
@@ -553,6 +572,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, term);
} catch (e) {
done(e);
return;
}
terminal.dispose();
disposables.push(window.onDidCloseTerminal(() => done()));
@@ -588,6 +608,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal);
} catch (e) {
done(e);
return;
}
// Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
@@ -633,6 +654,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal);
} catch (e) {
done(e);
return;
}
// Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
@@ -677,6 +699,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal);
} catch (e) {
done(e);
return;
}
// Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {
@@ -718,6 +741,7 @@ import { doesNotThrow, equal, ok, deepEqual, throws } from 'assert';
equal(terminal, e.terminal);
} catch (e) {
done(e);
return;
}
// Multiple expected could show up in the same data event
while (expectedText.length > 0 && e.data.indexOf(expectedText[0]) >= 0) {