Merge from vscode 2b0b9136329c181a9e381463a1f7dc3a2d105a34 (#4880)

src/sqltest/parts/insights/insightsUtils.test.ts

@@ -171,8 +171,8 @@ suite('Insights Utils tests', function () {
 
 	});
 
-	suiteTeardown(done => {
+	suiteTeardown(() => {
 		// Clean up our test files
-		pfs.del(testRootPath).then(done());
+		return pfs.rimraf(testRootPath);
 	});
 });

src/sqltest/stubs/contextKeyServiceStub.ts

@@ -36,4 +36,7 @@ export class ContextKeyServiceStub implements IContextKeyService {
 		return undefined;
 	}
 
+	bufferChangeEvents(callback: Function): void {
+	}
+
 }