[taler-wallet-core] branch master updated: testing: give option to restart merchant without DB reset.

[gnunet]

This is an automated email from the git hooks/post-receive script.

ms pushed a commit to branch master
in repository wallet-core.

The following commit(s) were added to refs/heads/master by this push:
     new 2ccfa3c2 testing: give option to restart merchant without DB reset.
2ccfa3c2 is described below

commit 2ccfa3c2f2e52e6d8f0d629b48aa522b0df9965c
Author: ms <ms@taler.net>
AuthorDate: Fri Jul 30 09:46:19 2021 +0200

    testing: give option to restart merchant without DB reset.
---
 packages/taler-wallet-cli/src/integrationtests/harness.ts         | 6 ++++--
 packages/taler-wallet-cli/src/integrationtests/test-revocation.ts | 2 +-
 packages/taler-wallet-cli/src/integrationtests/test-tipping.ts    | 7 +++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/packages/taler-wallet-cli/src/integrationtests/harness.ts 
b/packages/taler-wallet-cli/src/integrationtests/harness.ts
index 2f248d2a..95625518 100644
--- a/packages/taler-wallet-cli/src/integrationtests/harness.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/harness.ts
@@ -1441,8 +1441,10 @@ export class MerchantService implements 
MerchantServiceInterface {
     }
   }
 
-  async start(): Promise<void> {
-    await exec(`taler-merchant-dbinit -r -c "${this.configFilename}"`);
+  async start(
+    withResetTables: boolean = true, // eventually, this should become a named 
parameter
+  ): Promise<void> {
+    await exec(`taler-merchant-dbinit ${withResetTables ? "-r" : ""} -c 
"${this.configFilename}"`);
 
     this.proc = this.globalState.spawnService(
       "taler-merchant-httpd",
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts
index fc1ffb26..0b5c4755 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-revocation.ts
@@ -53,7 +53,7 @@ async function revokeAllWalletCoins(req: {
   await exchange.keyup();
   await delayMs(1000);
   await merchant.stop();
-  await merchant.start();
+  await merchant.start(false); // 'false' prevents DB reset
   await merchant.pingUntilAvailable();
 }
 
diff --git a/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts 
b/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts
index 7675db11..3eb8109e 100644
--- a/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts
+++ b/packages/taler-wallet-cli/src/integrationtests/test-tipping.ts
@@ -63,10 +63,9 @@ export async function runTippingTest(t: GlobalTestState) {
 
   await exchange.runWirewatchOnce();
 
-  // FIXME/WHY? Disabling for now, as start() erases the DB.
-  /*await merchant.stop();
-  await merchant.start();
-  await merchant.pingUntilAvailable();*/
+  await merchant.stop();
+  await merchant.start(false);
+  await merchant.pingUntilAvailable();
 
   const r = await MerchantPrivateApi.queryTippingReserves(merchant, "default");
   console.log("tipping reserves:", JSON.stringify(r, undefined, 2));

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.