From 3d6cff9c8400c2b5d1b5a0ce149656801b2300fe Mon Sep 17 00:00:00 2001
From: Florian Dold <florian@dold.me>
Date: Fri, 25 Aug 2023 11:22:52 +0200
Subject: harness: modernize some tests, temporarily disable revocation test

---
 .../test-age-restrictions-mixed-merchant.ts         | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

(limited to 'packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts')

diff --git a/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts b/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts
index 970acbb72..af90ef1c5 100644
--- a/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts
+++ b/packages/taler-harness/src/integrationtests/test-age-restrictions-mixed-merchant.ts
@@ -19,13 +19,12 @@
  */
 import { WalletApiOperation } from "@gnu-taler/taler-wallet-core";
 import { defaultCoinConfig } from "../harness/denomStructures.js";
-import { GlobalTestState, WalletCli } from "../harness/harness.js";
+import { GlobalTestState } from "../harness/harness.js";
 import {
-  makeTestPayment,
   createSimpleTestkudosEnvironmentV2,
-  withdrawViaBankV2,
-  makeTestPaymentV2,
   createWalletDaemonWithClient,
+  makeTestPaymentV2,
+  withdrawViaBankV2,
 } from "../harness/helpers.js";
 
 /**
@@ -59,7 +58,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
   {
     const walletClient = walletOne;
 
-    await withdrawViaBankV2(t, {
+    const wres = await withdrawViaBankV2(t, {
       walletClient,
       bank,
       exchange,
@@ -67,6 +66,8 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
       restrictAge: 13,
     });
 
+    await wres.withdrawalFinishedCond;
+
     const order = {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -82,7 +83,7 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
   }
 
   {
-    await withdrawViaBankV2(t, {
+    const wres = await withdrawViaBankV2(t, {
       walletClient: walletTwo,
       bank,
       exchange,
@@ -90,6 +91,9 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
       restrictAge: 13,
     });
 
+
+    await wres.withdrawalFinishedCond;
+
     const order = {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
@@ -101,13 +105,16 @@ export async function runAgeRestrictionsMixedMerchantTest(t: GlobalTestState) {
   }
 
   {
-    await withdrawViaBankV2(t, {
+    const wres = await withdrawViaBankV2(t, {
       walletClient: walletThree,
       bank,
       exchange,
       amount: "TESTKUDOS:20",
     });
 
+
+    await wres.withdrawalFinishedCond;
+
     const order = {
       summary: "Buy me!",
       amount: "TESTKUDOS:5",
-- 
cgit v1.2.3