smoke: better rimraf in main

test/smoke/package.json

@@ -14,7 +14,7 @@
     "@types/mocha": "^2.2.41",
     "@types/ncp": "^2.0.1",
     "@types/node": "^8.0.26",
-    "@types/rimraf": "^0.0.28",
+    "@types/rimraf": "^2.0.2",
     "@types/webdriverio": "^4.6.1",
     "htmlparser2": "^3.9.2",
     "mocha": "^3.2.0",

test/smoke/src/helpers/utilities.ts

@@ -5,7 +5,6 @@
 
 import * as fs from 'fs';
 import { dirname } from 'path';
-var rimraf = require('rimraf');
 
 /**
  * Contains methods that are commonly used across test areas.
@@ -25,28 +24,6 @@ export class Util {
 		}
 	}
 
-	public rimraf(directory: string): Promise<any> {
-		return new Promise((res, rej) => {
-			rimraf(directory, (err) => {
-				if (err) {
-					rej(err);
-				}
-				res();
-			});
-		});
-	}
-
-	public static rimraf(directory: string): Promise<any> {
-		return new Promise((res, rej) => {
-			rimraf(directory, (err) => {
-				if (err) {
-					rej(err);
-				}
-				res();
-			});
-		});
-	}
-
 	public static removeFile(filePath: string): void {
 		try {
 			fs.unlinkSync(`${filePath}`);

test/smoke/src/main.ts

@@ -185,6 +185,10 @@ before(async function () {
 	await setup();
 });
 
+after(async () => {
+	await new Promise((c, e) => rimraf(testDataPath, { maxBusyTries: 10 }, err => err ? e(err) : c()));
+});
+
 // import './areas/workbench/data-migration.test';
 import './areas/workbench/data-loss.test';
 import './areas/explorer/explorer.test';