smoke: make terminal tests more reliable

test/smoke/src/areas/editor/peek.ts

@@ -34,7 +34,6 @@ export class References {
 		await this.spectron.client.waitForText(References.REFERENCES_TITLE_FILE_NAME, file);
 	}
 
-
 	public async close(): Promise<void> {
 		await this.spectron.client.keys(['Escape', 'NULL']);
 		await this.spectron.client.waitForElement(References.REFERENCES_WIDGET, element => !element);

test/smoke/src/areas/terminal/terminal.test.ts

@@ -17,6 +17,14 @@ describe('Terminal', () => {
 
 		await app.workbench.terminal.runCommand(`echo ${expected}`);
 
-		await app.workbench.terminal.waitForTerminalText(terminalText => !!terminalText[terminalText.length - 2] && terminalText[terminalText.length - 2].trim() === expected);
+		await app.workbench.terminal.waitForTerminalText(terminalText => {
+			// Last line will not contain the output
+			for (let index = terminalText.length - 2; index >= 0; index--) {
+				if (!!terminalText[index] && terminalText[index].trim() === expected) {
+					return true;
+				}
+			}
+			return false;
+		});
 	});
 });
\ No newline at end of file

test/smoke/src/areas/terminal/terminal.ts

@@ -32,11 +32,6 @@ export class Terminal {
 		await this.spectron.client.keys(['Enter', 'NULL']);
 	}
 
-	public async waitForTextInLine(line: number, fn: (text: string) => boolean): Promise<string> {
-		const terminalText = await this.waitForTerminalText(terminalText => fn(terminalText[line - 1]), 'Waiting for Text in line ' + line);
-		return terminalText[line - 1];
-	}
-
 	public async waitForTerminalText(fn: (text: string[]) => boolean, timeOutDescription: string = 'Getting Terminal Text'): Promise<string[]> {
 		return this.spectron.client.waitFor(async () => {
 			const terminalText = await this.getTerminalText();