Merge pull request #6655 from dibarbet/test_integration_errors

Attempt to stabilize some of the O# integration test failures

Author: dibarbet

omnisharptest/omnisharpIntegrationTests/diagnostics.integration.test.ts

@@ -7,6 +7,7 @@ import { describe, expect, test, beforeAll, afterAll } from '@jest/globals';
 import * as vscode from 'vscode';
 import * as path from 'path';
 import {
+    ActivationResult,
     activateCSharpExtension,
     describeIfNotGenerator,
     describeIfNotRazorOrGenerator,
@@ -39,8 +40,10 @@ describeIfNotGenerator(`DiagnosticProvider: ${testAssetWorkspace.description}`,
     let razorFileUri: vscode.Uri;
     let virtualRazorFileUri: vscode.Uri;
 
+    let activation: ActivationResult;
+
     beforeAll(async function () {
-        const activation = await activateCSharpExtension();
+        activation = await activateCSharpExtension();
         await testAssetWorkspace.restoreAndWait(activation);
 
         const fileName = 'diagnostics.cs';
@@ -53,10 +56,12 @@ describeIfNotGenerator(`DiagnosticProvider: ${testAssetWorkspace.description}`,
         virtualRazorFileUri = vscode.Uri.file(razorFileUri.fsPath + '__virtual.cs');
     });
 
+    afterAll(async () => {
+        await testAssetWorkspace.cleanupWorkspace();
+    });
+
     describeIfRazor('razor workspace', () => {
         beforeAll(async function () {
-            const activation = await activateCSharpExtension();
-            await testAssetWorkspace.restore();
             await vscode.commands.executeCommand('vscode.open', razorFileUri);
             await testAssetWorkspace.waitForIdle(activation.eventStream);
         });
@@ -82,18 +87,11 @@ describeIfNotGenerator(`DiagnosticProvider: ${testAssetWorkspace.description}`,
                 }
             );
         });
-
-        afterAll(async () => {
-            await testAssetWorkspace.cleanupWorkspace();
-        });
     });
 
     describeIfNotRazorOrGenerator('small workspace (based on maxProjectFileCountForDiagnosticAnalysis setting)', () => {
         beforeAll(async function () {
-            const activation = await activateCSharpExtension();
-            await testAssetWorkspace.restore();
             await vscode.commands.executeCommand('vscode.open', fileUri);
-
             await testAssetWorkspace.waitForIdle(activation.eventStream);
         });
 
@@ -162,10 +160,6 @@ describeIfNotGenerator(`DiagnosticProvider: ${testAssetWorkspace.description}`,
                 (res) => expect(res.length).toBeGreaterThan(0)
             );
         });
-
-        afterAll(async () => {
-            await testAssetWorkspace.cleanupWorkspace();
-        });
     });
 
     const describeCondition =
@@ -179,8 +173,6 @@ describeIfNotGenerator(`DiagnosticProvider: ${testAssetWorkspace.description}`,
     describeCondition('large workspace (based on maxProjectFileCountForDiagnosticAnalysis setting)', () => {
         beforeAll(async function () {
             await setDiagnosticWorkspaceLimit(1);
-            const activation = await activateCSharpExtension();
-            await testAssetWorkspace.restore();
             await restartOmniSharpServer();
             await testAssetWorkspace.waitForIdle(activation.eventStream);
         });
@@ -208,9 +200,5 @@ describeIfNotGenerator(`DiagnosticProvider: ${testAssetWorkspace.description}`,
                 (secondaryDiag) => expect(secondaryDiag.length).toEqual(0)
             );
         });
-
-        afterAll(async () => {
-            await testAssetWorkspace.cleanupWorkspace();
-        });
     });
 });

src/features/commands.ts

@@ -198,13 +198,13 @@ async function dotnetRestoreAllProjects(server: OmniSharpServer, eventStream: Ev
 
 async function getProjectDescriptors(server: OmniSharpServer): Promise<protocol.ProjectDescriptor[]> {
     if (!server.isRunning()) {
-        return Promise.reject('OmniSharp server is not running.');
+        throw new Error('OmniSharp server is not running.');
     }
 
     const info = await serverUtils.requestWorkspaceInformation(server);
     const descriptors = protocol.getDotNetCoreProjectDescriptors(info);
     if (descriptors.length === 0) {
-        return Promise.reject('No .NET Core projects found');
+        throw new Error('No .NET Core projects found');
     }
 
     return descriptors;

src/omnisharp/server.ts

@@ -741,7 +741,7 @@ export class OmniSharpServer {
 
     public async makeRequest<TResponse>(command: string, data?: any, token?: CancellationToken): Promise<TResponse> {
         if (this._state.status !== ServerState.Started) {
-            return Promise.reject<TResponse>('OmniSharp server is not running.');
+            throw new Error('OmniSharp server is not running.');
         }
 
         const { engine } = this._state;