From 72fd099ecd26c7542d10d67a75f5d4f4ab1bf361 Mon Sep 17 00:00:00 2001 From: Thomas Scholtes Date: Tue, 21 Nov 2023 18:31:02 +0100 Subject: [PATCH] Stop confirming removal of test tmp files MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We stop asking for confirmation to remove the folders containing the static generated fixtures. All the data is programatically generated so it’s not a big deal if it is lost. In any case the data is retained after a test run and only deleted before the next test run. Signed-off-by: Thomas Scholtes --- httpd-client/tests/support/globalSetup.ts | 4 ---- tests/support/globalSetup.ts | 4 ---- tests/support/support.ts | 27 ----------------------- 3 files changed, 35 deletions(-) diff --git a/httpd-client/tests/support/globalSetup.ts b/httpd-client/tests/support/globalSetup.ts index d97b2a9f4..f1dc585f4 100644 --- a/httpd-client/tests/support/globalSetup.ts +++ b/httpd-client/tests/support/globalSetup.ts @@ -2,7 +2,6 @@ import * as FsSync from "node:fs"; import * as Path from "node:path"; import { assertRadInstalled, - promptWorkspaceRemoval, removeWorkspace, tmpDir, } from "@tests/support/support.js"; @@ -30,9 +29,6 @@ export default async function globalSetup(): Promise<() => void> { if (!process.env.SKIP_FIXTURE_CREATION) { console.log("Setting up global test environment"); - if (!process.env.CI) { - await promptWorkspaceRemoval(); - } await removeWorkspace(); const peerManager = await createPeerManager({ diff --git a/tests/support/globalSetup.ts b/tests/support/globalSetup.ts index 94258d055..911cc60f7 100644 --- a/tests/support/globalSetup.ts +++ b/tests/support/globalSetup.ts @@ -2,7 +2,6 @@ import * as FsSync from "node:fs"; import * as Path from "node:path"; import { assertRadInstalled, - promptWorkspaceRemoval, removeWorkspace, tmpDir, } from "@tests/support/support.js"; @@ -31,9 +30,6 @@ export default async function globalSetup(): Promise<() => void> { if (!process.env.SKIP_FIXTURE_CREATION) { console.log("Setting up global test environment"); - if (!process.env.CI) { - await promptWorkspaceRemoval(); - } await removeWorkspace(); // Workaround for fixing MaxListenersExceededWarning. diff --git a/tests/support/support.ts b/tests/support/support.ts index 7e2ef610f..d8a1b337a 100644 --- a/tests/support/support.ts +++ b/tests/support/support.ts @@ -5,7 +5,6 @@ import * as Crypto from "node:crypto"; import { fileURLToPath } from "node:url"; import * as Path from "node:path"; import * as Fs from "node:fs/promises"; -import * as readline from "node:readline/promises"; // Generate string of 12 random characters with 8 bits of entropy. export function randomTag(): string { @@ -45,32 +44,6 @@ export async function assertRadInstalled(): Promise { } } -export async function promptWorkspaceRemoval(): Promise { - console.log(""); - console.log("This will irrevocably destroy the following directories:"); - console.log(""); - workspacePaths.forEach(path => console.log(path)); - console.log(""); - - const rl = readline.createInterface({ - input: process.stdin, - output: process.stdout, - }); - - const result = await rl.question( - "Are you sure you want to continue? [yes/no]: ", - ); - rl.close(); - - if (result.toLowerCase() === "yes") { - console.log("Done"); - return; - } - - console.log("Ok, I won't touch your data."); - process.exit(1); -} - export async function removeWorkspace(): Promise { for (const path of workspacePaths) { await Fs.rm(path, {