diff options
Diffstat (limited to 'packages/taler-harness/src')
-rw-r--r-- | packages/taler-harness/src/harness/harness.ts | 1 | ||||
-rw-r--r-- | packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts (renamed from packages/taler-harness/src/integrationtests/test-withdrawal-high.ts) | 26 | ||||
-rw-r--r-- | packages/taler-harness/src/integrationtests/testrunner.ts | 4 |
3 files changed, 19 insertions, 12 deletions
diff --git a/packages/taler-harness/src/harness/harness.ts b/packages/taler-harness/src/harness/harness.ts index e95dea0c6..b2c73c9ab 100644 --- a/packages/taler-harness/src/harness/harness.ts +++ b/packages/taler-harness/src/harness/harness.ts @@ -1981,7 +1981,6 @@ export class WalletClient { walletClient.args.onNotification(n); } waiter.notify(n); - console.log("got notification from wallet-core in WalletClient"); }, }); this.remoteWallet = w; diff --git a/packages/taler-harness/src/integrationtests/test-withdrawal-high.ts b/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts index deb0e6dde..248931d71 100644 --- a/packages/taler-harness/src/integrationtests/test-withdrawal-high.ts +++ b/packages/taler-harness/src/integrationtests/test-withdrawal-huge.ts @@ -19,20 +19,21 @@ */ import { GlobalTestState, - WalletCli, setupDb, ExchangeService, FakebankService, + WalletService, + WalletClient, } from "../harness/harness.js"; import { WalletApiOperation } from "@gnu-taler/taler-wallet-core"; import { CoinConfig, defaultCoinConfig } from "../harness/denomStructures.js"; -import { URL } from "@gnu-taler/taler-util"; +import { NotificationType, URL } from "@gnu-taler/taler-util"; /** * Withdraw a high amount. Mostly intended * as a perf test. */ -export async function runWithdrawalHighTest(t: GlobalTestState) { +export async function runWithdrawalHugeTest(t: GlobalTestState) { // Set up test environment const db = await setupDb(t); @@ -71,7 +72,16 @@ export async function runWithdrawalHighTest(t: GlobalTestState) { console.log("setup done!"); - const wallet = new WalletCli(t); + const walletService = new WalletService(t, { name: "w1" }); + await walletService.start(); + await walletService.pingUntilAvailable(); + + const wallet = new WalletClient({ + unixPath: walletService.socketPath, + }); + await wallet.connect(); + + const withdrawalFinishedCond = wallet.waitForNotificationCond((wn) => wn.type === NotificationType.WithdrawGroupFinished); await wallet.client.call(WalletApiOperation.AddExchange, { exchangeBaseUrl: exchange.baseUrl, @@ -85,15 +95,13 @@ export async function runWithdrawalHighTest(t: GlobalTestState) { await exchange.runWirewatchOnce(); - await wallet.runUntilDone(); + await withdrawalFinishedCond; // Check balance const balResp = await wallet.client.call(WalletApiOperation.GetBalances, {}); console.log(balResp); - - await t.shutdown(); } -runWithdrawalHighTest.suites = ["wallet-perf"]; -runWithdrawalHighTest.excludeByDefault = true; +runWithdrawalHugeTest.suites = ["wallet-perf"]; +runWithdrawalHugeTest.excludeByDefault = true; diff --git a/packages/taler-harness/src/integrationtests/testrunner.ts b/packages/taler-harness/src/integrationtests/testrunner.ts index 3d70e6860..70008e386 100644 --- a/packages/taler-harness/src/integrationtests/testrunner.ts +++ b/packages/taler-harness/src/integrationtests/testrunner.ts @@ -95,7 +95,7 @@ import { runAgeRestrictionsPeerTest } from "./test-age-restrictions-peer.js"; import { runWalletNotificationsTest } from "./test-wallet-notifications.js"; import { runAgeRestrictionsMixedMerchantTest } from "./test-age-restrictions-mixed-merchant.js"; import { runWalletCryptoWorkerTest } from "./test-wallet-cryptoworker.js"; -import { runWithdrawalHighTest } from "./test-withdrawal-high.js"; +import { runWithdrawalHugeTest } from "./test-withdrawal-huge.js"; import { runKycTest } from "./test-kyc.js"; import { runPaymentAbortTest } from "./test-payment-abort.js"; import { runWithdrawalFeesTest } from "./test-withdrawal-fees.js"; @@ -190,7 +190,7 @@ const allTests: TestMainFunction[] = [ runWithdrawalBankIntegratedTest, runWithdrawalFakebankTest, runWithdrawalFeesTest, - runWithdrawalHighTest, + runWithdrawalHugeTest, ]; export interface TestRunSpec { |