From 90c19f86cee105a6a3c74fa4741dca341e9f8e0c Mon Sep 17 00:00:00 2001 From: "lpete@vmware.com" Date: Fri, 18 Aug 2023 15:42:24 -0400 Subject: [PATCH] remove unnecessary dbms string, fix ternary Signed-off-by: lpete@vmware.com --- packages/e2e-test/src/commands/index.ts | 10 +--------- packages/e2e-test/src/commands/run.ts | 17 +++++++---------- 2 files changed, 8 insertions(+), 19 deletions(-) diff --git a/packages/e2e-test/src/commands/index.ts b/packages/e2e-test/src/commands/index.ts index d2770d6a1e..95d311427c 100644 --- a/packages/e2e-test/src/commands/index.ts +++ b/packages/e2e-test/src/commands/index.ts @@ -18,13 +18,5 @@ import { Command } from 'commander'; import { run } from './run'; export function registerCommands(program: Command) { - program - .command('run') - .description('Run e2e tests') - .option( - '-db, --dbms ', - 'Selected database management system for e2e testing, (eg. mysql, postgres)', - 'postgres', - ) - .action(run); + program.command('run').description('Run e2e tests').action(run); } diff --git a/packages/e2e-test/src/commands/run.ts b/packages/e2e-test/src/commands/run.ts index 3254feab98..b57e426116 100644 --- a/packages/e2e-test/src/commands/run.ts +++ b/packages/e2e-test/src/commands/run.ts @@ -434,17 +434,14 @@ async function dropDB(database: string, client: string) { try { if (client === 'postgres') { const config = { - host: process.env.POSTGRES_HOST ? process.env.POSTGRES_HOST : '', - port: process.env.POSTGRES_PORT ? process.env.POSTGRES_PORT : '', - user: process.env.POSTGRES_USER ? process.env.POSTGRES_USER : '', - password: process.env.POSTGRES_PASSWORD - ? process.env.POSTGRES_PASSWORD - : '', + host: process.env.POSTGRES_HOST, + port: process.env.POSTGRES_PORT, + user: process.env.POSTGRES_USER, + password: process.env.POSTGRES_PASSWORD, }; await pgtools.dropdb(config, database); } else if (client === 'mysql') { - const connectionString = - process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING ?? ''; + const connectionString = process.env.MYSQL_CONNECTION ?? ''; const connection = await mysql.createConnection(connectionString); await connection.execute('DROP DATABASE ?', [database]); } @@ -459,10 +456,10 @@ async function preCleanDatabase() { if (Boolean(process.env.POSTGRES_HOST)) { await dropClientDatabases('postgres'); } - if (Boolean(process.env.BACKSTAGE_TEST_DATABASE_MYSQL8_CONNECTION_STRING)) { + if (Boolean(process.env.MYSQL_CONNECTION)) { await dropClientDatabases('mysql'); } - print('Created DBs'); + print('Dropped DBs'); } async function dropClientDatabases(client: string) {