taler/wallet-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Activity

test harness: log with logger API

Browse Source
This commit is contained in:
Florian Dold 2022-08-24 19:57:18 +02:00
parent 42c2b7508f
commit fff3df81e4
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
1 changed files with 33 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
packages/taler-wallet-cli/src/harness/harness.ts
View File

@ -21,6 +21,8 @@
* @author Florian Dold <dold@taler.net> * @author Florian Dold <dold@taler.net>
*/ */
const logger = new Logger("harness.ts");
/** /**
* Imports * Imports
*/ */
@ -37,6 +39,7 @@ import {
encodeCrock, encodeCrock,
hash, hash,
j2s, j2s,
Logger,
parsePaytoUri, parsePaytoUri,
stringToBytes, stringToBytes,
TalerProtocolDuration, TalerProtocolDuration,
@ -100,7 +103,7 @@ export async function sh(
command: string, command: string,
env: { [index: string]: string | undefined } = process.env, env: { [index: string]: string | undefined } = process.env,
): Promise<string> { ): Promise<string> {
console.log("running command", command); logger.info(`running command ${command}`);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const stdoutChunks: Buffer[] = []; const stdoutChunks: Buffer[] = [];
const proc = spawn(command, { const proc = spawn(command, {
@ -121,7 +124,7 @@ export async function sh(
}); });
proc.stderr.pipe(stderrLog); proc.stderr.pipe(stderrLog);
proc.on("exit", (code, signal) => { proc.on("exit", (code, signal) => {
console.log(`child process exited (${code} / ${signal})`); logger.info(`child process exited (${code} / ${signal})`);
if (code != 0) { if (code != 0) {
reject(Error(`Unexpected exit code ${code} for '${command}'`)); reject(Error(`Unexpected exit code ${code} for '${command}'`));
return; return;
@ -158,7 +161,7 @@ export async function runCommand(
args: string[], args: string[],
env: { [index: string]: string | undefined } = process.env, env: { [index: string]: string | undefined } = process.env,
): Promise<string> { ): Promise<string> {
console.log("running command", shellescape([command, ...args])); logger.info(`running command ${shellescape([command, ...args])}`);
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const stdoutChunks: Buffer[] = []; const stdoutChunks: Buffer[] = [];
const proc = spawn(command, args, { const proc = spawn(command, args, {
@ -179,7 +182,7 @@ export async function runCommand(
}); });
proc.stderr.pipe(stderrLog); proc.stderr.pipe(stderrLog);
proc.on("exit", (code, signal) => { proc.on("exit", (code, signal) => {
console.log(`child process exited (${code} / ${signal})`); logger.info(`child process exited (${code} / ${signal})`);
if (code != 0) { if (code != 0) {
reject(Error(`Unexpected exit code ${code} for '${command}'`)); reject(Error(`Unexpected exit code ${code} for '${command}'`));
return; return;
@ -310,19 +313,19 @@ export class GlobalTestState {
logName: string, logName: string,
env: { [index: string]: string | undefined } = process.env, env: { [index: string]: string | undefined } = process.env,
): ProcessWrapper { ): ProcessWrapper {
console.log( logger.info(
`spawning process (${logName}): ${shellescape([command, ...args])}`, `spawning process (${logName}): ${shellescape([command, ...args])}`,
); );
const proc = spawn(command, args, { const proc = spawn(command, args, {
stdio: ["inherit", "pipe", "pipe"], stdio: ["inherit", "pipe", "pipe"],
env: env, env: env,
}); });
console.log(`spawned process (${logName}) with pid ${proc.pid}`); logger.info(`spawned process (${logName}) with pid ${proc.pid}`);
proc.on("error", (err) => { proc.on("error", (err) => {
console.log(`could not start process (${command})`, err); logger.warn(`could not start process (${command})`, err);
}); });
proc.on("exit", (code, signal) => { proc.on("exit", (code, signal) => {
console.log(`process ${logName} exited ${j2s({ code, signal })}`); logger.warn(`process ${logName} exited ${j2s({ code, signal })}`);
}); });
const stderrLogFileName = this.testDir + `/${logName}-stderr.log`; const stderrLogFileName = this.testDir + `/${logName}-stderr.log`;
const stderrLog = fs.createWriteStream(stderrLogFileName, { const stderrLog = fs.createWriteStream(stderrLogFileName, {
@ -344,18 +347,18 @@ export class GlobalTestState {
return; return;
} }
if (shouldLingerInTest()) { if (shouldLingerInTest()) {
console.log("refusing to shut down, lingering was requested"); logger.info("refusing to shut down, lingering was requested");
return; return;
} }
this.inShutdown = true; this.inShutdown = true;
console.log("shutting down"); logger.info("shutting down");
for (const s of this.servers) { for (const s of this.servers) {
s.close(); s.close();
s.removeAllListeners(); s.removeAllListeners();
} }
for (const p of this.procs) { for (const p of this.procs) {
if (p.proc.exitCode == null) { if (p.proc.exitCode == null) {
console.log("killing process", p.proc.pid); logger.info(`killing process ${p.proc.pid}`);
p.proc.kill("SIGTERM"); p.proc.kill("SIGTERM");
await p.wait(); await p.wait();
} }
@ -458,12 +461,12 @@ export async function pingProc(
} }
while (true) { while (true) {
try { try {
console.log(`pinging ${serviceName} at ${url}`); logger.info(`pinging ${serviceName} at ${url}`);
const resp = await axios.get(url); const resp = await axios.get(url);
console.log(`service ${serviceName} available`); logger.info(`service ${serviceName} available`);
return; return;
} catch (e: any) { } catch (e: any) {
console.log(`service ${serviceName} not ready:`, e.toString()); logger.info(`service ${serviceName} not ready:`, e.toString());
//console.log(e); //console.log(e);
await delayMs(1000); await delayMs(1000);
} }
@ -563,7 +566,7 @@ class LibEuFinBankService extends BankServiceBase implements BankServiceHandle {
accountName: string, accountName: string,
password: string, password: string,
): Promise<HarnessExchangeBankAccount> { ): Promise<HarnessExchangeBankAccount> {
console.log("Create Exchange account(s)!"); logger.info("Create Exchange account(s)!");
/** /**
* Many test cases try to create a Exchange account before * Many test cases try to create a Exchange account before
* starting the bank; that's because the Pybank did it entirely * starting the bank; that's because the Pybank did it entirely
@ -704,7 +707,7 @@ class LibEuFinBankService extends BankServiceBase implements BankServiceHandle {
// Only go ahead if BOTH aren't running. // Only go ahead if BOTH aren't running.
if (this.sandboxProc || this.nexusProc) { if (this.sandboxProc || this.nexusProc) {
console.log("Nexus or Sandbox already running, not taking any action."); logger.info("Nexus or Sandbox already running, not taking any action.");
return; return;
} }
await sh( await sh(
@ -831,7 +834,7 @@ class FakebankService extends BankServiceBase implements BankServiceHandle {
async start(): Promise<void> { async start(): Promise<void> {
if (this.proc) { if (this.proc) {
console.log("fakebank already running, not starting again"); logger.info("fakebank already running, not starting again");
return; return;
} }
this.proc = this.globalTestState.spawnService( this.proc = this.globalTestState.spawnService(
@ -879,7 +882,7 @@ export class FakeBankService {
static fromExistingConfig(gc: GlobalTestState): FakeBankService { static fromExistingConfig(gc: GlobalTestState): FakeBankService {
const cfgFilename = gc.testDir + "/bank.conf"; const cfgFilename = gc.testDir + "/bank.conf";
console.log("reading fakebank config from", cfgFilename); logger.info("reading fakebank config from", cfgFilename);
const config = Configuration.load(cfgFilename); const config = Configuration.load(cfgFilename);
const bc: FakeBankConfig = { const bc: FakeBankConfig = {
currency: config.getString("taler", "currency").required(), currency: config.getString("taler", "currency").required(),
@ -1018,7 +1021,7 @@ export class ExchangeService implements ExchangeServiceInterface {
[...this.timetravelArgArr, "-c", this.configFilename, "-t", "-y"], [...this.timetravelArgArr, "-c", this.configFilename, "-t", "-y"],
); );
} catch (e) { } catch (e) {
console.log( logger.info(
"running aggregator with KYC off didn't work, might be old version, running again", "running aggregator with KYC off didn't work, might be old version, running again",
); );
await runCommand( await runCommand(
@ -1255,7 +1258,7 @@ export class ExchangeService implements ExchangeServiceInterface {
} }
} }
console.log("configuring bank accounts", accounts); logger.info("configuring bank accounts", accounts);
for (const acc of accounts) { for (const acc of accounts) {
await runCommand( await runCommand(
@ -1750,7 +1753,7 @@ export class MerchantService implements MerchantServiceInterface {
if (!this.proc) { if (!this.proc) {
throw Error("merchant must be running to add instance"); throw Error("merchant must be running to add instance");
} }
console.log("adding instance"); logger.info("adding instance");
const url = `http://localhost:${this.merchantConfig.httpPort}/management/instances`; const url = `http://localhost:${this.merchantConfig.httpPort}/management/instances`;
const auth = instanceConfig.auth ?? { method: "external" }; const auth = instanceConfig.auth ?? { method: "external" };
@ -1860,7 +1863,7 @@ export async function runTestWithState(
let status: TestStatus; let status: TestStatus;
const handleSignal = (s: string) => { const handleSignal = (s: string) => {
console.warn( logger.warn(
`**** received fatal process event, terminating test ${testName}`, `**** received fatal process event, terminating test ${testName}`,
); );
gc.shutdownSync(); gc.shutdownSync();
@ -1873,7 +1876,7 @@ export async function runTestWithState(
process.on("uncaughtException", handleSignal); process.on("uncaughtException", handleSignal);
try { try {
console.log("running test in directory", gc.testDir); logger.info("running test in directory", gc.testDir);
await Promise.race([testMain(gc), p.promise]); await Promise.race([testMain(gc), p.promise]);
status = "pass"; status = "pass";
if (linger) { if (linger) {
@ -1884,7 +1887,7 @@ export async function runTestWithState(
}); });
await new Promise<void>((resolve, reject) => { await new Promise<void>((resolve, reject) => {
rl.question("Press enter to shut down test.", () => { rl.question("Press enter to shut down test.", () => {
console.error("Requested shutdown"); logger.error("Requested shutdown");
resolve(); resolve();
}); });
}); });
@ -1934,7 +1937,9 @@ export class WalletCli {
const self = this; const self = this;
this._client = { this._client = {
async call(op: any, payload: any): Promise<any> { async call(op: any, payload: any): Promise<any> {
console.log("calling wallet with timetravel arg", self.timetravelArg); logger.info(
`calling wallet with timetravel arg ${j2s(self.timetravelArg)}`,
);
const resp = await sh( const resp = await sh(
self.globalTestState, self.globalTestState,
`wallet-${self.name}`, `wallet-${self.name}`,
@ -1944,9 +1949,9 @@ export class WalletCli {
self.dbfile self.dbfile
}' api '${op}' ${shellWrap(JSON.stringify(payload))}`, }' api '${op}' ${shellWrap(JSON.stringify(payload))}`,
); );
console.log("--- wallet core response ---"); logger.info("--- wallet core response ---");
console.log(resp); logger.info(resp);
console.log("--- end of response ---"); logger.info("--- end of response ---");
let ar: any; let ar: any;
try { try {
ar = JSON.parse(resp) as CoreApiResponse; ar = JSON.parse(resp) as CoreApiResponse;