-fix issue on Florian's system

This commit is contained in:
Christian Grothoff 2022-09-20 23:18:46 +02:00
parent bf85d6f3d1
commit a2c179373e
No known key found for this signature in database
GPG Key ID: 939E6BE1E29FC3CC
2 changed files with 4 additions and 2 deletions

View File

@ -418,6 +418,8 @@ taler-wallet-cli --no-throttle --wallet-db=$WALLET_DB api 'runIntegrationTest' \
--arg BANK_URL "$BANK_URL/access-api/" --arg BANK_URL "$BANK_URL/access-api/"
)" &> taler-wallet-cli.log )" &> taler-wallet-cli.log
bash
echo "Shutting down services" echo "Shutting down services"
exit_cleanup exit_cleanup

View File

@ -969,7 +969,7 @@ function test_11() {
# this test is only concerned about the outgoing wire transfer # this test is only concerned about the outgoing wire transfer
# being detected as such, and we simply ignore the other # being detected as such, and we simply ignore the other
# errors being reported.) # errors being reported.)
OTHER_IBAN=`echo -e "SELECT iban FROM BankAccounts WHERE label='fortytwo'" | sqlite3 ${DB}-nexus.sqlite3` OTHER_IBAN=`echo -e "SELECT iban FROM BankAccounts WHERE label='fortytwo'" | sqlite3 ${DB}-sandbox.sqlite3`
NEW_TX=$(echo "$OLD_TX" | jq .batches[0].batchTransactions[0].details.creditDebitIndicator='"DBIT"' | jq 'del(.batches[0].batchTransactions[0].details.debtor)' | jq 'del(.batches[0].batchTransactions[0].details.debtorAccount)' | jq 'del(.batches[0].batchTransactions[0].details.debtorAgent)' | jq '.batches[0].batchTransactions[0].details.creditor'='{"name": "Forty Two"}' | jq .batches[0].batchTransactions[0].details.creditorAccount='{"iban": "'$OTHER_IBAN'"}' | jq .batches[0].batchTransactions[0].details.creditorAgent='{"bic": "SANDBOXX"}' | jq .batches[0].batchTransactions[0].details.unstructuredRemittanceInformation='"CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/"') NEW_TX=$(echo "$OLD_TX" | jq .batches[0].batchTransactions[0].details.creditDebitIndicator='"DBIT"' | jq 'del(.batches[0].batchTransactions[0].details.debtor)' | jq 'del(.batches[0].batchTransactions[0].details.debtorAccount)' | jq 'del(.batches[0].batchTransactions[0].details.debtorAgent)' | jq '.batches[0].batchTransactions[0].details.creditor'='{"name": "Forty Two"}' | jq .batches[0].batchTransactions[0].details.creditorAccount='{"iban": "'$OTHER_IBAN'"}' | jq .batches[0].batchTransactions[0].details.creditorAgent='{"bic": "SANDBOXX"}' | jq .batches[0].batchTransactions[0].details.unstructuredRemittanceInformation='"CK9QBFY972KR32FVA1MW958JWACEB6XCMHHKVFMCH1A780Q12SVG http://exchange.example.com/"')
echo -e "UPDATE NexusBankTransactions SET transactionJson='"$NEW_TX"' WHERE id=$OLD_ID" | sqlite3 ${DB}-nexus.sqlite3 echo -e "UPDATE NexusBankTransactions SET transactionJson='"$NEW_TX"' WHERE id=$OLD_ID" | sqlite3 ${DB}-nexus.sqlite3
# Now fake that the exchange prepared this payment (= it POSTed to /transfer) # Now fake that the exchange prepared this payment (= it POSTed to /transfer)
@ -1675,7 +1675,7 @@ function test_27() {
# Obtain data to duplicate. # Obtain data to duplicate.
WTID=`echo SELECT wtid FROM TalerRequestedPayments WHERE id=1 | sqlite3 ${DB}-nexus.sqlite3` WTID=`echo SELECT wtid FROM TalerRequestedPayments WHERE id=1 | sqlite3 ${DB}-nexus.sqlite3`
echo WTID=$WTID echo WTID=$WTID
OTHER_IBAN=`echo -e "SELECT iban FROM BankAccounts WHERE label='fortytwo'" | sqlite3 ${DB}-nexus.sqlite3` OTHER_IBAN=`echo -e "SELECT iban FROM BankAccounts WHERE label='fortytwo'" | sqlite3 ${DB}-sandbox.sqlite3`
stop_libeufin stop_libeufin
# 'rawConfirmation' is set to 2 here, that doesn't # 'rawConfirmation' is set to 2 here, that doesn't
# point to any record. That's only needed to set a non null value. # point to any record. That's only needed to set a non null value.