commit 20c89397fa0e72a8e3a00c5575ace4f8ebebdf4e
parent bf50fc933b8a5a610d5b432a80d1ecd7034852f9
Author: Florian Dold <florian@dold.me>
Date: Fri, 17 Jul 2026 18:27:32 +0200
harness: be more tolerant of tx state to avoid timing issues
Diffstat:
1 file changed, 19 insertions(+), 21 deletions(-)
diff --git a/packages/taler-harness/src/integrationtests/test-peer-push.ts b/packages/taler-harness/src/integrationtests/test-peer-push.ts
@@ -36,6 +36,18 @@ const purseExpiration = AbsoluteTime.toProtocolTimestamp(
AbsoluteTime.addDuration(AbsoluteTime.now(), Duration.fromSpec({ days: 2 })),
);
+const stFinalUnsuccessful = [
+ {
+ major: TransactionMajorState.Failed,
+ },
+ {
+ major: TransactionMajorState.Expired,
+ },
+ {
+ major: TransactionMajorState.Aborted,
+ },
+];
+
/**
* Run a test for basic peer-push payments.
*/
@@ -223,23 +235,17 @@ export async function runPeerPushTest(t: GlobalTestState) {
}),
wallet3.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare3.transactionId,
- txState: {
- major: TransactionMajorState.Failed,
- },
+ txState: stFinalUnsuccessful,
}),
]),
Promise.all([
wallet2.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare2.transactionId,
- txState: {
- major: TransactionMajorState.Failed,
- },
+ txState: stFinalUnsuccessful,
}),
wallet3.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare3.transactionId,
- txState: {
- major: TransactionMajorState.Done,
- },
+ txState: stFinalUnsuccessful,
}),
]),
]);
@@ -335,17 +341,13 @@ export async function runPeerPushTest(t: GlobalTestState) {
}),
wallet3.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare3.transactionId,
- txState: {
- major: TransactionMajorState.Failed,
- },
+ txState: stFinalUnsuccessful,
}),
]),
Promise.all([
wallet2.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare2.transactionId,
- txState: {
- major: TransactionMajorState.Failed,
- },
+ txState: stFinalUnsuccessful,
}),
wallet3.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare3.transactionId,
@@ -389,18 +391,14 @@ export async function runPeerPushTest(t: GlobalTestState) {
await wallet2.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare2.transactionId,
- txState: {
- major: TransactionMajorState.Failed,
- },
+ txState: stFinalUnsuccessful,
});
t.logStep("waiting for wallet3");
await wallet3.call(WalletApiOperation.TestingWaitTransactionState, {
transactionId: prepare3.transactionId,
- txState: {
- major: TransactionMajorState.Aborted,
- },
+ txState: stFinalUnsuccessful,
});
});