Fixed waiting issue, added test retry number to screenshot path.

test/smoke/src/helpers/screenshot.ts

@@ -12,11 +12,11 @@ export class Screenshot {
 	private index: number = 0;
 	private testPath: string;
 
-	constructor(private spectron: SpectronApplication, testName: string) {
+	constructor(private spectron: SpectronApplication, testName: string, testRetry: number) {
 		const testTime = this.sanitizeFolderName(__testTime);
 		testName = this.sanitizeFolderName(testName);
 
-		this.testPath = `test_data/screenshots/${testTime}/${testName}`;
+		this.testPath = `test_data/screenshots/${testTime}/${testName}/${testRetry}`;
 		this.createFolder(this.testPath);
 	}
 

test/smoke/src/spectron/application.ts

@@ -54,9 +54,9 @@ export class SpectronApplication {
 			args: args,
 			chromeDriverArgs: chromeDriverArgs
 		});
-		this.screenshot = new Screenshot(this, testName);
-		this.client = new SpectronClient(this.spectron, this.screenshot);
 		this.testRetry += 1; // avoid multiplication by 0 for wait times
+		this.screenshot = new Screenshot(this, testName, testRetry);
+		this.client = new SpectronClient(this.spectron, this.screenshot);
 		this.retrieveKeybindings();
 	}
 
@@ -129,7 +129,7 @@ export class SpectronApplication {
 					break;
 				}
 
-				this.wait();
+				await this.wait();
 				trial++;
 			}
 		});