提交 75e18f22 编写于 作者: S Sandeep Somavarapu

smoke: add timeout descriptions

上级 91334704
...@@ -17,7 +17,7 @@ export class Terminal { ...@@ -17,7 +17,7 @@ export class Terminal {
if (!await this.isVisible()) { if (!await this.isVisible()) {
await this.spectron.workbench.commandPallette.runCommand('View: Toggle Integrated Terminal'); await this.spectron.workbench.commandPallette.runCommand('View: Toggle Integrated Terminal');
await this.spectron.client.waitForElement(Terminal.TERMINAL_SELECTOR); await this.spectron.client.waitForElement(Terminal.TERMINAL_SELECTOR);
await this.waitForTerminalText(text => !!text[text.length - 1] && text[text.length - 1].trim().indexOf('vscode-smoketest-express') !== -1); await this.waitForTerminalText(text => !!text[text.length - 1] && text[text.length - 1].trim().indexOf('vscode-smoketest-express') !== -1, 'Waiting for Terminal to be ready');
} }
} }
...@@ -32,18 +32,18 @@ export class Terminal { ...@@ -32,18 +32,18 @@ export class Terminal {
} }
public async waitForTextInLine(line: number, fn: (text: string) => boolean): Promise<string> { public async waitForTextInLine(line: number, fn: (text: string) => boolean): Promise<string> {
const terminalText = await this.waitForTerminalText(terminalText => fn(terminalText[line - 1])); const terminalText = await this.waitForTerminalText(terminalText => fn(terminalText[line - 1]), 'Waiting for Text in line ' + line);
return terminalText[line - 1]; return terminalText[line - 1];
} }
public async waitForTerminalText(fn: (text: string[]) => boolean): Promise<string[]> { public async waitForTerminalText(fn: (text: string[]) => boolean, timeOutDescription: string = 'Getting Terminal Text'): Promise<string[]> {
return this.spectron.client.waitFor(async () => { return this.spectron.client.waitFor(async () => {
const terminalText = await this.getTerminalText(); const terminalText = await this.getTerminalText();
if (fn(terminalText)) { if (fn(terminalText)) {
return terminalText; return terminalText;
} }
return undefined; return undefined;
}, void 0, 'Getting terminal text'); }, void 0, timeOutDescription);
} }
public getCurrentLineNumber(): Promise<number> { public getCurrentLineNumber(): Promise<number> {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册