From 0c4d5d53c9b4138ef04f50f114828f8c9f6f9fa7 Mon Sep 17 00:00:00 2001 From: Muhammad Atif Ali Date: Fri, 16 Feb 2024 19:49:46 +0300 Subject: [PATCH] attempt to fix tests --- test.ts | 5 ++++- vscode-web/main.test.ts | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/test.ts b/test.ts index 37e0805..c2201a9 100644 --- a/test.ts +++ b/test.ts @@ -34,6 +34,7 @@ export const runContainer = async ( export const executeScriptInContainer = async ( state: TerraformState, image: string, + command: string = "", shell: string = "sh", ): Promise<{ exitCode: number; @@ -42,7 +43,9 @@ export const executeScriptInContainer = async ( }> => { const instance = findResourceInstance(state, "coder_script"); const id = await runContainer(image); - const resp = await execContainer(id, [shell, "-c", instance.script]); + // const resp = await execContainer(id, [shell, "-c", instance.script]); + command = command + " " + instance.script; + const resp = await execContainer(id, [shell, "-c", command]); const stdout = resp.stdout.trim().split("\n"); const stderr = resp.stderr.trim().split("\n"); return { diff --git a/vscode-web/main.test.ts b/vscode-web/main.test.ts index e7a9306..bd9f38e 100644 --- a/vscode-web/main.test.ts +++ b/vscode-web/main.test.ts @@ -37,7 +37,7 @@ describe("vscode-web", async () => { agent_id: "foo", accept_license: "true", }); - const output = await executeScriptInContainer(state, "alpine"); + const output = await executeScriptInContainer(state, "alpine", "apk add gcompat libgcc libstdc++"); expect(output.exitCode).toBe(1); expect(output.stdout).toEqual([ "\u001b[0;1mInstalling Microsoft Visual Studio Code Server!", @@ -50,7 +50,7 @@ describe("vscode-web", async () => { agent_id: "foo", accept_license: "true", }); - const output = await executeScriptInContainer(state, "alpine/curl"); + const output = await executeScriptInContainer(state, "alpine/curl", "apk add gcompat libgcc libstdc++"); expect(output.exitCode).toBe(0); expect(output.stdout).toEqual([ "\u001b[0;1mInstalling Microsoft Visual Studio Code Server!",