extension/test/gopls: increase the stretchr test timeout

Allow more time for shutting down gopls. The stretchr
test requires 3rd party modules to build and need more
time for gopls to load & shutdown.

Remove unnecessary async in afterEach callback.
This async caused the callback to be unnecessarily wrapped
in a Promise and triggered confusing error message in case
of test failure - unresolved promise even when the cause of
failure is somewhere else.

Change-Id: Iabf3f7639ae68548fb730183bf7fc8c925ecca79
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/618356
kokoro-CI: kokoro <[email protected]>
Commit-Queue: Hyang-Ah Hana Kim <[email protected]>
Reviewed-by: Robert Findley <[email protected]>

Author: hyangah

extension/test/gopls/codelens.test.ts

@@ -29,7 +29,7 @@ suite('Code lenses for testing and benchmarking', function () {
 	const testdataDir = path.join(projectDir, 'test', 'testdata', 'codelens');
 	const env = new Env();
 
-	this.afterEach(async function () {
+	this.afterEach(function () {
 		// Note: this shouldn't use () => {...}. Arrow functions do not have 'this'.
 		// I don't know why but this.currentTest.state does not have the expected value when
 		// used with teardown.
@@ -229,16 +229,14 @@ suite('Code lenses for testing and benchmarking', function () {
 });
 
 suite('Code lenses with stretchr/testify/suite', function () {
-	if (process.platform === 'win32') {
-		this.timeout(20000); // Gopls on windows needs more time to load required modules.
-	}
+	this.timeout(20000); // Gopls needs to load modules from the internet for this test.
 
 	const ctx = MockExtensionContext.new();
 
 	const testdataDir = path.join(__dirname, '..', '..', '..', 'test', 'testdata', 'stretchrTestSuite');
 	const env = new Env();
 
-	this.afterEach(async function () {
+	this.afterEach(function () {
 		// Note: this shouldn't use () => {...}. Arrow functions do not have 'this'.
 		// I don't know why but this.currentTest.state does not have the expected value when
 		// used with teardown.

extension/test/gopls/goplsTestEnv.utils.ts

@@ -143,14 +143,11 @@ export class Env {
 	public async teardown() {
 		try {
 			await vscode.commands.executeCommand('workbench.action.closeActiveEditor');
-			await this.languageClient?.stop(1000); // 1s timeout
+			await this.languageClient?.stop(10000); // 10s timeout
 		} catch (e) {
-			console.log(`failed to stop gopls within 1sec: ${e}`);
+			console.log(`failed to stop gopls within 10sec: ${e}`);
+			this.flushTrace(true);
 		} finally {
-			if (this.languageClient?.isRunning()) {
-				console.log(`failed to stop language client on time: ${this.languageClient?.state}`);
-				this.flushTrace(true);
-			}
 			for (const d of this.disposables) {
 				d.dispose();
 			}