From b1fd7d09a605558bc61ed113331e0e065e0e2681 Mon Sep 17 00:00:00 2001
From: Florian Dold <florian.dold@gmail.com>
Date: Mon, 24 Aug 2020 11:52:12 +0530
Subject: test case for order claiming; more accurate EC

---
 packages/taler-integrationtests/src/harness.ts     | 24 +++++++++++-----------
 .../taler-integrationtests/src/test-payment.ts     |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'packages/taler-integrationtests/src')

diff --git a/packages/taler-integrationtests/src/harness.ts b/packages/taler-integrationtests/src/harness.ts
index 545ea3097..f4429d43f 100644
--- a/packages/taler-integrationtests/src/harness.ts
+++ b/packages/taler-integrationtests/src/harness.ts
@@ -1266,22 +1266,24 @@ function shellWrap(s: string) {
 }
 
 export class WalletCli {
-  constructor(private globalTestState: GlobalTestState) {}
+  constructor(private globalTestState: GlobalTestState, private name: string = "default") {}
+
+  get dbfile(): string {
+    return this.globalTestState.testDir + `/walletdb-${this.name}.json`;
+  }
 
   deleteDatabase() {
-    const wdb = this.globalTestState.testDir + "/walletdb.json";
-    fs.unlinkSync(wdb);
+    fs.unlinkSync(this.dbfile);
   }
 
   async apiRequest(
     request: string,
     payload: unknown,
   ): Promise<CoreApiResponse> {
-    const wdb = this.globalTestState.testDir + "/walletdb.json";
     const resp = await sh(
       this.globalTestState,
-      "wallet",
-      `taler-wallet-cli --no-throttle --wallet-db '${wdb}' api '${request}' ${shellWrap(
+      `wallet-${this.name}`,
+      `taler-wallet-cli --no-throttle --wallet-db '${this.dbfile}' api '${request}' ${shellWrap(
         JSON.stringify(payload),
       )}`,
     );
@@ -1290,20 +1292,18 @@ export class WalletCli {
   }
 
   async runUntilDone(): Promise<void> {
-    const wdb = this.globalTestState.testDir + "/walletdb.json";
     await sh(
       this.globalTestState,
-      "wallet",
-      `taler-wallet-cli --no-throttle --wallet-db ${wdb} run-until-done`,
+      `wallet-${this.name}`,
+      `taler-wallet-cli --no-throttle --wallet-db ${this.dbfile} run-until-done`,
     );
   }
 
   async runPending(): Promise<void> {
-    const wdb = this.globalTestState.testDir + "/walletdb.json";
     await sh(
       this.globalTestState,
-      "wallet",
-      `taler-wallet-cli --no-throttle --wallet-db ${wdb} run-pending`,
+      `wallet-${this.name}`,
+      `taler-wallet-cli --no-throttle --wallet-db ${this.dbfile} run-pending`,
     );
   }
 
diff --git a/packages/taler-integrationtests/src/test-payment.ts b/packages/taler-integrationtests/src/test-payment.ts
index d2cbb10f4..d2401e072 100644
--- a/packages/taler-integrationtests/src/test-payment.ts
+++ b/packages/taler-integrationtests/src/test-payment.ts
@@ -17,7 +17,7 @@
 /**
  * Imports.
  */
-import { runTest, GlobalTestState, MerchantPrivateApi } from "./harness";
+import { runTest, GlobalTestState, MerchantPrivateApi, WalletCli } from "./harness";
 import { createSimpleTestkudosEnvironment, withdrawViaBank } from "./helpers";
 import { PreparePayResultType } from "taler-wallet-core";
 
-- 
cgit v1.2.3