aboutsummaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorFlorian Dold <florian@dold.me>2024-03-07 12:59:16 +0100
committerFlorian Dold <florian@dold.me>2024-03-07 12:59:16 +0100
commite923ce6675b34259fd52f704bb502208df519cd6 (patch)
treefc1f83598140f974b3c19008390b3c35662bf32d /packages
parent44b45c06a9aff1e28996dd7bce75ea3a0785dae0 (diff)
downloadwallet-core-e923ce6675b34259fd52f704bb502208df519cd6.tar.xz
-fix test
Diffstat (limited to 'packages')
-rw-r--r--packages/taler-harness/src/harness/harness.ts9
-rw-r--r--packages/taler-harness/src/integrationtests/test-exchange-management.ts12
-rw-r--r--packages/taler-harness/src/integrationtests/test-refund-gone.ts2
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
index 3d9e7fb8a..831d4ab3c 100644
--- 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
index 8e2a8f589..9d3c1d867 100644
--- 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
index 60098cc9b..056560eb8 100644
--- 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({