Merge branch 'master' into nklose/adt-decreases-highlighting

viperproject · Jan 25, 2024 · b109ded · b109ded
2 parents e67e5ac + 6a36aec
commit b109ded
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -44,7 +44,7 @@
 		"@typescript-eslint/eslint-plugin": "^5.54.0",
 		"@typescript-eslint/parser": "^5.54.0",
 		"@viperproject/locate-java-home": "^1.1.11",
-		"@vscode/test-electron": "^2.3.0",
+		"@vscode/test-electron": "^2.3.8",
 		"@vscode/vsce": "^2.18.0",
 		"eslint": "^8.35.0",
 		"eslint-webpack-plugin": "^4.0.0",

diff --git a/client/src/test/1_ide.test.ts b/client/src/test/1_ide.test.ts
@@ -31,7 +31,8 @@ suite('ViperIDE Tests', () => {
         }, 300);
 
         await TestHelper.waitForVerificationOrAbort();
-        await TestHelper.checkForRunningProcesses(false, true, true);
+        //await TestHelper.wait(20000); // This is really stupid, but Windows fails to clean up processes quickly in this case for some reason
+        //await TestHelper.checkForRunningProcesses(false, true, true);
         await TestHelper.openAndVerify(LONG);
         assert (!TestHelper.hasObservedInternalError());
     });