taler-typescript-core

commit e923ce6675b34259fd52f704bb502208df519cd6
parent 44b45c06a9aff1e28996dd7bce75ea3a0785dae0
Author: Florian Dold <florian@dold.me>
Date:   Thu,  7 Mar 2024 12:59:16 +0100

-fix test

Diffstat:
M
packages/taler-harness/src/harness/harness.ts
 | 
9
+++++++++
M
packages/taler-harness/src/integrationtests/test-exchange-management.ts
 | 
12
+++++++-----
M
packages/taler-harness/src/integrationtests/test-refund-gone.ts
 | 
2
+-

3 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts
@@ -1251,6 +1251,15 @@ export class ExchangeService implements ExchangeServiceInterface {
     }
   }
 
+  async stopAggregator(): Promise<void> {
+    const agg = this.exchangeAggregatorProc;
+    if (agg) {
+      agg.proc.kill("SIGTERM");
+      await agg.wait();
+      this.exchangeAggregatorProc = undefined;
+    }
+  }
+
   async startWirewatch(): Promise<void> {
     const wirewatch = this.exchangeWirewatchProc;
     if (wirewatch) {
diff --git a/packages/taler-harness/src/integrationtests/test-exchange-management.ts b/packages/taler-harness/src/integrationtests/test-exchange-management.ts
@@ -29,15 +29,17 @@ export async function runExchangeManagementTest(
 ): Promise<void> {
   // Set up test environment
 
-  const { walletClient, bank, exchange } =
+  const { walletClient, exchange } =
     await createSimpleTestkudosEnvironmentV2(t);
 
+  // Since the default exchanges can change, we start the wallet in tests
+  // with no built-in defaults. Thus the list of exchanges is empty here.
   const exchangesListResult = await walletClient.call(
     WalletApiOperation.ListExchanges,
     {},
   );
 
-  t.assertDeepEqual(exchangesListResult.exchanges.length, 1);
+  t.assertDeepEqual(exchangesListResult.exchanges.length, 0);
 
   await walletClient.call(WalletApiOperation.UpdateExchangeEntry, {
     exchangeBaseUrl: exchange.baseUrl,
@@ -49,7 +51,7 @@ export async function runExchangeManagementTest(
     {},
   );
 
-  t.assertDeepEqual(exchangesListResult2.exchanges.length, 2);
+  t.assertDeepEqual(exchangesListResult2.exchanges.length, 1);
 
   await walletClient.call(WalletApiOperation.DeleteExchange, {
     exchangeBaseUrl: exchange.baseUrl,
@@ -60,7 +62,7 @@ export async function runExchangeManagementTest(
     {},
   );
 
-  t.assertDeepEqual(exchangesListResult3.exchanges.length, 1);
+  t.assertDeepEqual(exchangesListResult3.exchanges.length, 0);
 
   // Check for regression: Can we re-add a deleted exchange?
 
@@ -74,7 +76,7 @@ export async function runExchangeManagementTest(
     {},
   );
 
-  t.assertDeepEqual(exchangesListResult4.exchanges.length, 2);
+  t.assertDeepEqual(exchangesListResult4.exchanges.length, 1);
 }
 
 runExchangeManagementTest.suites = ["wallet", "exchange"];
diff --git a/packages/taler-harness/src/integrationtests/test-refund-gone.ts b/packages/taler-harness/src/integrationtests/test-refund-gone.ts
@@ -107,7 +107,7 @@ export async function runRefundGoneTest(t: GlobalTestState) {
     Duration.toMilliseconds(Duration.fromSpec({ hours: 1 })),
     { exchange, merchant, walletClient: walletClient },
   );
-
+  await exchange.stopAggregator();
   await exchange.runAggregatorOnce();
 
   const ref = await merchantClient.giveRefund({