From 855de8f09ef41909dc65a51adf4b954272a51dd2 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Wed, 9 Aug 2023 18:06:11 -0700 Subject: ci: :green_heart: testing testing in ci --- extension/src/test-suite/environmentSetup.test.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'extension/src/test-suite') diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts index 9a478522..a6aa3433 100644 --- a/extension/src/test-suite/environmentSetup.test.ts +++ b/extension/src/test-suite/environmentSetup.test.ts @@ -2,18 +2,22 @@ import { test, describe } from "mocha"; import * as assert from "assert"; import { getContinueServerUrl } from "../bridge"; -import { startContinuePythonServer } from "../activation/environmentSetup"; +import { ideProtocolClient } from "../activation/activate"; import fetch from "node-fetch"; +import fkill from "fkill"; describe("Can start python server", () => { test("Can start python server in under 10 seconds", async function () { - this.timeout(17_000); - await startContinuePythonServer(); + fkill(65432, { force: true, silent: true }); + const allowedTime = 10_000; + this.timeout(allowedTime + 1000); - await new Promise((resolve) => setTimeout(resolve, 15_000)); + // If successful, the server is started by the extension while we wait + await new Promise((resolve) => setTimeout(resolve, allowedTime)); // Check if server is running const serverUrl = getContinueServerUrl(); + console.log("Server URL: ", serverUrl); const response = await fetch(`${serverUrl}/health`); assert.equal(response.status, 200); }); -- cgit v1.2.3-70-g09d2 From 4636c9590154d6b5995948003da212eb25003750 Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Wed, 9 Aug 2023 20:56:11 -0700 Subject: fix: :bug: write out npm run package as package.js --- extension/package.json | 2 +- extension/scripts/package.js | 40 +++++++++++++++++++++++ extension/src/test-suite/environmentSetup.test.ts | 2 +- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 extension/scripts/package.js (limited to 'extension/src/test-suite') diff --git a/extension/package.json b/extension/package.json index ea4d8c16..7cf2bc7d 100644 --- a/extension/package.json +++ b/extension/package.json @@ -195,7 +195,7 @@ "lint": "eslint src --ext ts", "build-test": "tsc && node esbuild.test.mjs", "test": "npm run build-test && node ./out/test-runner/runTestOnVSCodeHost.js", - "package": "npm install && npm run typegen && npm run clientgen && cd react-app && npm install && npm run build && cd .. && mkdir build && vsce package --out ./build" + "package": "node scripts/package.js" }, "devDependencies": { "@nestjs/common": "^8.4.7", diff --git a/extension/scripts/package.js b/extension/scripts/package.js new file mode 100644 index 00000000..4703ebc2 --- /dev/null +++ b/extension/scripts/package.js @@ -0,0 +1,40 @@ +const { exec } = require("child_process"); +const fs = require("fs"); + +exec("npm install", (error) => { + if (error) throw error; + console.log("npm install completed"); + + exec("npm run typegen", (error) => { + if (error) throw error; + console.log("npm run typegen completed"); + + exec("npm run clientgen", (error) => { + if (error) throw error; + console.log("npm run clientgen completed"); + + process.chdir("react-app"); + + exec("npm install", (error) => { + if (error) throw error; + console.log("npm install in react-app completed"); + + exec("npm run build", (error) => { + if (error) throw error; + console.log("npm run build in react-app completed"); + + process.chdir(".."); + + if (!fs.existsSync("build")) { + fs.mkdirSync("build"); + } + + exec("vsce package --out ./build", (error) => { + if (error) throw error; + console.log("vsce package completed"); + }); + }); + }); + }); + }); +}); diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts index a6aa3433..a0d6cbaa 100644 --- a/extension/src/test-suite/environmentSetup.test.ts +++ b/extension/src/test-suite/environmentSetup.test.ts @@ -9,7 +9,7 @@ import fkill from "fkill"; describe("Can start python server", () => { test("Can start python server in under 10 seconds", async function () { fkill(65432, { force: true, silent: true }); - const allowedTime = 10_000; + const allowedTime = 15_000; this.timeout(allowedTime + 1000); // If successful, the server is started by the extension while we wait -- cgit v1.2.3-70-g09d2 From 08b1cfdd2f6f456df7344c16f5d229a0ccfb841b Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Wed, 9 Aug 2023 21:14:13 -0700 Subject: fix: :green_heart: increase testing timeout to allow for fkill --- extension/src/test-suite/environmentSetup.test.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extension/src/test-suite') diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts index a0d6cbaa..8099e9ac 100644 --- a/extension/src/test-suite/environmentSetup.test.ts +++ b/extension/src/test-suite/environmentSetup.test.ts @@ -8,9 +8,9 @@ import fkill from "fkill"; describe("Can start python server", () => { test("Can start python server in under 10 seconds", async function () { - fkill(65432, { force: true, silent: true }); const allowedTime = 15_000; - this.timeout(allowedTime + 1000); + this.timeout(allowedTime + 10_000); + fkill(65432, { force: true, silent: true }); // If successful, the server is started by the extension while we wait await new Promise((resolve) => setTimeout(resolve, allowedTime)); -- cgit v1.2.3-70-g09d2 From 40ec1a31a7cd37da8b75bbabf1f0d160bb7bec5d Mon Sep 17 00:00:00 2001 From: Nate Sesti Date: Thu, 10 Aug 2023 11:24:46 -0700 Subject: fix: :white_check_mark: allow longer wait in test --- extension/src/test-suite/environmentSetup.test.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'extension/src/test-suite') diff --git a/extension/src/test-suite/environmentSetup.test.ts b/extension/src/test-suite/environmentSetup.test.ts index 8099e9ac..d0406340 100644 --- a/extension/src/test-suite/environmentSetup.test.ts +++ b/extension/src/test-suite/environmentSetup.test.ts @@ -8,9 +8,14 @@ import fkill from "fkill"; describe("Can start python server", () => { test("Can start python server in under 10 seconds", async function () { - const allowedTime = 15_000; + const allowedTime = 25_000; this.timeout(allowedTime + 10_000); - fkill(65432, { force: true, silent: true }); + try { + fkill(65432, { force: true, silent: true }); + console.log("Killed existing server"); + } catch (e) { + console.log("No existing server: ", e); + } // If successful, the server is started by the extension while we wait await new Promise((resolve) => setTimeout(resolve, allowedTime)); -- cgit v1.2.3-70-g09d2