Remove test ws in runTest instead in test suite

Printing out the contents always and
remove only if tests were succesfull

Author: jneira

test/runTest.ts

@@ -1,3 +1,4 @@
+// tslint:disable: no-console
 import * as cp from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -12,9 +13,20 @@ function installExtension(vscodeExePath: string, extId: string) {
   });
 }
 
+function showDirContens(dir: string) {
+  console.log(dir);
+  const files = fs.readdirSync(dir, { withFileTypes: true });
+  files.forEach((file: fs.Dirent) => {
+    const absPath = path.resolve(dir, file.name);
+    if (file.isDirectory()) {
+      showDirContens(absPath);
+    }
+  });
+}
+
 async function main() {
   try {
-    const vscodeExecutablePath = await downloadAndUnzipVSCode('1.61.2');
+    const vscodeExecutablePath = await downloadAndUnzipVSCode('stable');
 
     // We have to install this dependant extension
     installExtension(vscodeExecutablePath, 'justusadam.language-haskell');
@@ -34,12 +46,19 @@ async function main() {
     }
 
     // Download VS Code, unzip it and run the integration test
-    await runTests({
+    const exitCode = await runTests({
       vscodeExecutablePath,
       extensionDevelopmentPath,
       extensionTestsPath,
       launchArgs: [testWorkspace],
     });
+
+    console.log('Test workspace contents: ');
+    showDirContens(testWorkspace);
+    if (exitCode === 0) {
+      console.log(`Tests were succesfull, deleting test workspace in ${testWorkspace}`)
+      fs.rmdirSync(testWorkspace, { recursive: true });
+    }
   } catch (err) {
     console.error(err);
     console.error('Failed to run tests');

test/suite/extension.test.ts

@@ -31,16 +31,6 @@ function getWorkspaceFile(name: string) {
   return wsroot.with({ path: path.posix.join(wsroot.path, name) });
 }
 
-async function deleteWorkspaceFiles() {
-  const dirContents = await vscode.workspace.fs.readDirectory(getWorkspaceRoot().uri);
-  console.log(`Deleting test ws contents: ${dirContents}`);
-  dirContents.forEach(async ([name, type]) => {
-    const uri: vscode.Uri = getWorkspaceFile(name);
-    console.log(`Deleting ${uri}`);
-    await vscode.workspace.fs.delete(getWorkspaceFile(name), { recursive: true });
-  });
-}
-
 suite('Extension Test Suite', () => {
   const disposables: vscode.Disposable[] = [];
 
@@ -61,11 +51,11 @@ suite('Extension Test Suite', () => {
   vscode.window.showInformationMessage('Start all tests.');
 
   suiteSetup(async () => {
-    await deleteWorkspaceFiles();
     await getHaskellConfig().update('logFile', 'hls.log');
     await getHaskellConfig().update('trace.server', 'messages');
     await getHaskellConfig().update('releasesDownloadStoragePath', path.normalize(getWorkspaceFile('bin').fsPath));
-    await getHaskellConfig().update('serverEnvironment', { XDG_CACHE_HOME: path.normalize(getWorkspaceFile('cache-test').fsPath) });
+    await getHaskellConfig().update('serverEnvironment',
+      { XDG_CACHE_HOME: path.normalize(getWorkspaceFile('cache-test').fsPath) });
     const contents = new TextEncoder().encode('main = putStrLn "hi vscode tests"');
     await vscode.workspace.fs.writeFile(getWorkspaceFile('Main.hs'), contents);
   });
@@ -110,9 +100,9 @@ suite('Extension Test Suite', () => {
   });
 
   suiteTeardown(async () => {
+    console.log('Disposing all resources')
     disposables.forEach((d) => d.dispose());
+    console.log('Stopping the lsp server');
     await vscode.commands.executeCommand(CommandNames.StopServerCommandName);
-    delay(5); // to give time to shutdown server
-    await deleteWorkspaceFiles();
   });
 });