fix peek race condition

joaomoreno · joaomoreno · commit 30c497bd7be5 · 2018-04-13T10:32:07.000+02:00
diff --git a/test/smoke/src/areas/editor/peek.ts b/test/smoke/src/areas/editor/peek.ts
@@ -34,7 +34,19 @@ export class References {
 	}
 
 	async close(): Promise<void> {
-		await this.code.dispatchKeybinding('escape');
-		await this.code.waitForElement(References.REFERENCES_WIDGET, element => !element);
+		// Sometimes someone else eats up the `Escape` key
+		let count = 0;
+		while (true) {
+			await this.code.dispatchKeybinding('escape');
+
+			try {
+				await this.code.waitForElement(References.REFERENCES_WIDGET, el => !el, 10);
+				return;
+			} catch (err) {
+				if (++count > 5) {
+					throw err;
+				}
+			}
+		}
 	}
 }
diff --git a/test/smoke/src/vscode/code.ts b/test/smoke/src/vscode/code.ts
@@ -242,9 +242,9 @@ export class Code {
 		return await poll(() => this.driver.getElements(windowId, selector, recursive), accept, `get elements '${selector}'`);
 	}
 
-	async waitForElement(selector: string, accept: (result: IElement | undefined) => boolean = result => !!result): Promise<IElement> {
+	async waitForElement(selector: string, accept: (result: IElement | undefined) => boolean = result => !!result, retryCount: number = 200): Promise<IElement> {
 		const windowId = await this.getActiveWindowId();
-		return await poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, `get element '${selector}'`);
+		return await poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, `get element '${selector}'`, retryCount);
 	}
 
 	async waitForActiveElement(selector: string, retryCount: number = 200): Promise<void> {

Original file line number	Diff line number	Diff line change
`@@ -242,9 +242,9 @@ export class Code {`
`242`	`242`	return await poll(() => this.driver.getElements(windowId, selector, recursive), accept, `get elements '${selector}'`);
`243`	`243`	`}`
`244`	`244`
`245`		`- async waitForElement(selector: string, accept: (result: IElement \| undefined) => boolean = result => !!result): Promise<IElement> {`
	`245`	`+ async waitForElement(selector: string, accept: (result: IElement \| undefined) => boolean = result => !!result, retryCount: number = 200): Promise<IElement> {`
`246`	`246`	`const windowId = await this.getActiveWindowId();`
`247`		- return await poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, `get element '${selector}'`);
	`247`	+ return await poll<IElement>(() => this.driver.getElements(windowId, selector).then(els => els[0]), accept, `get element '${selector}'`, retryCount);
`248`	`248`	`}`
`249`	`249`
`250`	`250`	`async waitForActiveElement(selector: string, retryCount: number = 200): Promise<void> {`