From fbd01d0b3229a2118cf68dc6d0cda77f35bb0bfe Mon Sep 17 00:00:00 2001 From: Nicolas Klose Date: Wed, 24 Jan 2024 16:06:16 +0100 Subject: [PATCH 1/6] update and delay --- client/package-lock.json | 18 +++++++++--------- client/package.json | 2 +- client/src/test/1_ide.test.ts | 1 + 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/client/package-lock.json b/client/package-lock.json index 223ed417..23020473 100644 --- a/client/package-lock.json +++ b/client/package-lock.json @@ -1,12 +1,12 @@ { "name": "viper", - "version": "4.1.1", + "version": "4.2.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "viper", - "version": "4.1.1", + "version": "4.2.2", "license": "SEE LICENSE IN LICENSE.txt", "devDependencies": { "@types/glob": "^8.1.0", @@ -877,15 +877,15 @@ } }, "node_modules/@vscode/test-electron": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.0.tgz", - "integrity": "sha512-fwzA9RtazH1GT/sckYlbxu6t5e4VaMXwCVtyLv4UAG0hP6NTfnMaaG25XCfWqlVwFhBMcQXHBCy5dmz2eLUnkw==", + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@vscode/test-electron/-/test-electron-2.3.8.tgz", + "integrity": "sha512-b4aZZsBKtMGdDljAsOPObnAi7+VWIaYl3ylCz1jTs+oV6BZ4TNHcVNC3xUn0azPeszBmwSBDQYfFESIaUQnrOg==", "dev": true, "dependencies": { "http-proxy-agent": "^4.0.1", "https-proxy-agent": "^5.0.0", "jszip": "^3.10.1", - "semver": "^7.3.8" + "semver": "^7.5.2" }, "engines": { "node": ">=16" @@ -5429,9 +5429,9 @@ "dev": true }, "node_modules/semver": { - "version": "7.3.8", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz", - "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==", + "version": "7.5.4", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.5.4.tgz", + "integrity": "sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==", "dev": true, "dependencies": { "lru-cache": "^6.0.0" diff --git a/client/package.json b/client/package.json index f8d349ee..8bfdfffa 100644 --- 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 index 820ba272..b6727cd1 100644 --- a/client/src/test/1_ide.test.ts +++ b/client/src/test/1_ide.test.ts @@ -31,6 +31,7 @@ suite('ViperIDE Tests', () => { }, 300); await TestHelper.waitForVerificationOrAbort(); + await TestHelper.wait(500); await TestHelper.checkForRunningProcesses(false, true, true); await TestHelper.openAndVerify(LONG); assert (!TestHelper.hasObservedInternalError()); From b295fc90dfe05cbab6e3919e959533e7b901e774 Mon Sep 17 00:00:00 2001 From: Nicolas Klose Date: Wed, 24 Jan 2024 16:14:37 +0100 Subject: [PATCH 2/6] more waiting? --- client/src/test/1_ide.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/1_ide.test.ts b/client/src/test/1_ide.test.ts index b6727cd1..dd190f25 100644 --- a/client/src/test/1_ide.test.ts +++ b/client/src/test/1_ide.test.ts @@ -31,7 +31,7 @@ suite('ViperIDE Tests', () => { }, 300); await TestHelper.waitForVerificationOrAbort(); - await TestHelper.wait(500); + await TestHelper.wait(2000); await TestHelper.checkForRunningProcesses(false, true, true); await TestHelper.openAndVerify(LONG); assert (!TestHelper.hasObservedInternalError()); From 33486192b3d787d43c500b4c77202c6c99e41f41 Mon Sep 17 00:00:00 2001 From: Nicolas Klose Date: Wed, 24 Jan 2024 16:38:36 +0100 Subject: [PATCH 3/6] even longer? --- client/src/test/1_ide.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/1_ide.test.ts b/client/src/test/1_ide.test.ts index dd190f25..39152826 100644 --- a/client/src/test/1_ide.test.ts +++ b/client/src/test/1_ide.test.ts @@ -31,7 +31,7 @@ suite('ViperIDE Tests', () => { }, 300); await TestHelper.waitForVerificationOrAbort(); - await TestHelper.wait(2000); + await TestHelper.wait(10000); await TestHelper.checkForRunningProcesses(false, true, true); await TestHelper.openAndVerify(LONG); assert (!TestHelper.hasObservedInternalError()); From d4d521ad4a8adf5f6ff987c70f2276ec5dad020a Mon Sep 17 00:00:00 2001 From: Nicolas Klose Date: Wed, 24 Jan 2024 16:46:09 +0100 Subject: [PATCH 4/6] I refuse to accept that something else might be the problem --- client/src/test/1_ide.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/1_ide.test.ts b/client/src/test/1_ide.test.ts index 39152826..1c06f56c 100644 --- a/client/src/test/1_ide.test.ts +++ b/client/src/test/1_ide.test.ts @@ -31,7 +31,7 @@ suite('ViperIDE Tests', () => { }, 300); await TestHelper.waitForVerificationOrAbort(); - await TestHelper.wait(10000); + await TestHelper.wait(20000); await TestHelper.checkForRunningProcesses(false, true, true); await TestHelper.openAndVerify(LONG); assert (!TestHelper.hasObservedInternalError()); From 63a4dedf56ccfd60be5905d0b3346bf80135d9bb Mon Sep 17 00:00:00 2001 From: Nicolas Klose Date: Wed, 24 Jan 2024 17:04:01 +0100 Subject: [PATCH 5/6] added a comment --- client/src/test/1_ide.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/test/1_ide.test.ts b/client/src/test/1_ide.test.ts index 1c06f56c..0f3bcf4c 100644 --- a/client/src/test/1_ide.test.ts +++ b/client/src/test/1_ide.test.ts @@ -31,7 +31,7 @@ suite('ViperIDE Tests', () => { }, 300); await TestHelper.waitForVerificationOrAbort(); - await TestHelper.wait(20000); + 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()); From 33ce9f9f818ade3eac19404fa8aebb640028cf17 Mon Sep 17 00:00:00 2001 From: Nicolas Klose Date: Wed, 24 Jan 2024 17:16:21 +0100 Subject: [PATCH 6/6] leaving out the check --- client/src/test/1_ide.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/src/test/1_ide.test.ts b/client/src/test/1_ide.test.ts index 0f3bcf4c..78b15a13 100644 --- a/client/src/test/1_ide.test.ts +++ b/client/src/test/1_ide.test.ts @@ -31,8 +31,8 @@ suite('ViperIDE Tests', () => { }, 300); await TestHelper.waitForVerificationOrAbort(); - 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.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()); });