Merge pull request #785 from rust-lang/fix-ci-tests

Fix the current test harness

Author: Xanewok

.vscode/launch.json

@@ -24,7 +24,8 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}",
-				"--extensionTestsPath=${workspaceFolder}/out/test"
+				"--extensionTestsPath=${workspaceFolder}/out/test/suite",
+				"${workspaceFolder}/fixtures"
 			],
 			"outFiles": [
 				"${workspaceFolder}/out/test/**/*.js"

package-lock.json

@@ -53,18 +53,20 @@
         "vscode-languageclient": "^4.3.0"
     },
     "devDependencies": {
+        "@types/chai": "^4.2.11",
         "@types/glob": "^7.1.1",
         "@types/mocha": "^5.2.6",
         "@types/node": "^10.10",
         "@types/vscode": "^1.31.0",
+        "chai": "^4.2.0",
         "glob": "^7.1.4",
         "mocha": "^6.2.3",
         "prettier": "^1.16.4",
         "tslint": "^5.14.0",
         "tslint-config-prettier": "^1.18.0",
         "typescript": "^3.0.0",
         "vsce": "^1.63.0",
-        "vscode-test": "^0.4.3"
+        "vscode-test": "^1.3.0"
     },
     "contributes": {
         "languages": [

package.json

@@ -45,7 +45,15 @@ interface ProgressParams {
   done?: boolean;
 }
 
-export async function activate(context: ExtensionContext) {
+/**
+ * External API as exposed by the extension. Can be queried by other extensions
+ * or by the integration test runner for VSCode extensions.
+ */
+export interface Api {
+  activeWorkspace: typeof activeWorkspace;
+}
+
+export async function activate(context: ExtensionContext): Promise<Api> {
   context.subscriptions.push(
     ...[
       configureLanguage(),
@@ -84,6 +92,8 @@ export async function activate(context: ExtensionContext) {
         return;
       });
   }
+
+  return { activeWorkspace };
 }
 
 export async function deactivate() {
@@ -106,7 +116,7 @@ function onDidChangeActiveTextEditor(editor: TextEditor | undefined) {
     return;
   }
 
-  activeWorkspace = workspace;
+  activeWorkspace.value = workspace;
 
   const updateProgress = (progress: WorkspaceProgress) => {
     if (progress.state === 'progress') {
@@ -121,9 +131,9 @@ function onDidChangeActiveTextEditor(editor: TextEditor | undefined) {
   if (progressObserver) {
     progressObserver.dispose();
   }
-  progressObserver = activeWorkspace.progress.observe(updateProgress);
+  progressObserver = workspace.progress.observe(updateProgress);
   // Update UI ourselves immediately and don't wait for value update callbacks
-  updateProgress(activeWorkspace.progress.value);
+  updateProgress(workspace.progress.value);
 }
 
 function whenChangingWorkspaceFolders(e: WorkspaceFoldersChangeEvent) {
@@ -176,7 +186,7 @@ type WorkspaceProgress =
 // We run one RLS and one corresponding language client per workspace folder
 // (VSCode workspace, not Cargo workspace). This class contains all the per-client
 // and per-workspace stuff.
-class ClientWorkspace {
+export class ClientWorkspace {
   public readonly folder: WorkspaceFolder;
   // FIXME(#233): Don't only rely on lazily initializing it once on startup,
   // handle possible `rust-client.*` value changes while extension is running
@@ -440,7 +450,7 @@ class ClientWorkspace {
  * Tracks the most current VSCode workspace as opened by the user. Used by the
  * commands to know in which workspace these should be executed.
  */
-let activeWorkspace: ClientWorkspace | null;
+const activeWorkspace = new Observable<ClientWorkspace | null>(null);
 
 /**
  * Registers the VSCode [commands] used by the extension.
@@ -451,23 +461,24 @@ function registerCommands(): Disposable[] {
   return [
     commands.registerCommand(
       'rls.update',
-      () => activeWorkspace && activeWorkspace.rustupUpdate(),
+      () => activeWorkspace.value && activeWorkspace.value.rustupUpdate(),
     ),
     commands.registerCommand(
       'rls.restart',
-      async () => activeWorkspace && activeWorkspace.restart(),
+      async () => activeWorkspace.value && activeWorkspace.value.restart(),
     ),
     commands.registerCommand(
       'rls.run',
-      (cmd: Execution) => activeWorkspace && activeWorkspace.runRlsCommand(cmd),
+      (cmd: Execution) =>
+        activeWorkspace.value && activeWorkspace.value.runRlsCommand(cmd),
     ),
     commands.registerCommand(
       'rls.start',
-      () => activeWorkspace && activeWorkspace.start(),
+      () => activeWorkspace.value && activeWorkspace.value.start(),
     ),
     commands.registerCommand(
       'rls.stop',
-      () => activeWorkspace && activeWorkspace.stop(),
+      () => activeWorkspace.value && activeWorkspace.value.stop(),
     ),
   ];
 }

src/extension.ts

@@ -3,11 +3,20 @@ import * as path from 'path';
 import { runTests } from 'vscode-test';
 
 (async () => {
-  const extensionPath = path.resolve(__dirname, '../../');
-  const testRunnerPath = path.resolve(__dirname, './suite');
+  const extensionDevelopmentPath = path.resolve(__dirname, '../../');
+  const extensionTestsPath = path.resolve(__dirname, './suite');
 
   await runTests({
-    extensionPath,
-    testRunnerPath,
+    extensionDevelopmentPath,
+    extensionTestsPath,
+    launchArgs: [
+      '--disable-extensions',
+      // Already start in the fixtures dir because we lose debugger connection
+      // once we re-open a different folder due to window reloading
+      path.join(extensionDevelopmentPath, 'fixtures'),
+    ],
+  }).catch(() => {
+    console.error(`Test run failed`);
+    process.exit(1);
   });
 })();