summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Grothoff <christian@grothoff.org>2019-09-05 10:59:03 +0200
committerChristian Grothoff <christian@grothoff.org>2019-09-05 10:59:03 +0200
commit997b40e7052474b6e7b6924291bb7c7b120c2690 (patch)
tree76186f7fe880de1096f9d3ab06258f57ba763855
parent8e9ce98661ed402ec4e037b4812feec893c151be (diff)
downloadexchange-997b40e7052474b6e7b6924291bb7c7b120c2690.tar.gz
exchange-997b40e7052474b6e7b6924291bb7c7b120c2690.tar.bz2
exchange-997b40e7052474b6e7b6924291bb7c7b120c2690.zip
fix tests
-rwxr-xr-xsrc/auditor/test-auditor.sh1
-rw-r--r--src/auditordb/test-auditor-db-postgres.conf3
-rw-r--r--src/exchange/test-taler-exchange-aggregator-postgres.conf14
3 files changed, 17 insertions, 1 deletions
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
index 7697b4fa7..f84c79389 100755
--- a/src/auditor/test-auditor.sh
+++ b/src/auditor/test-auditor.sh
@@ -944,6 +944,7 @@ then
exit_fail "Reported table wrong: $TABLE"
fi
DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json`
+DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'`
if test "x$DIAG" != "xexecution date missmatch"
then
exit_fail "Reported diagnostic wrong: $DIAG"
diff --git a/src/auditordb/test-auditor-db-postgres.conf b/src/auditordb/test-auditor-db-postgres.conf
index e06d511c1..b08195eb8 100644
--- a/src/auditordb/test-auditor-db-postgres.conf
+++ b/src/auditordb/test-auditor-db-postgres.conf
@@ -7,4 +7,5 @@ DB = postgres
CONFIG = "postgres:///talercheck"
[taler]
-CURRENCY = "EUR" \ No newline at end of file
+CURRENCY = "EUR"
+
diff --git a/src/exchange/test-taler-exchange-aggregator-postgres.conf b/src/exchange/test-taler-exchange-aggregator-postgres.conf
index c2c8aef1d..b6c18fd5b 100644
--- a/src/exchange/test-taler-exchange-aggregator-postgres.conf
+++ b/src/exchange/test-taler-exchange-aggregator-postgres.conf
@@ -35,6 +35,20 @@ IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
CONFIG = postgres:///talercheck
+[exchangedb]
+
+# After how long do we close idle reserves? The exchange
+# and the auditor must agree on this value. We currently
+# expect it to be globally defined for the whole system,
+# as there is no way for wallets to query this value. Thus,
+# it is only configurable for testing, and should be treated
+# as constant in production.
+IDLE_RESERVE_EXPIRATION_TIME = 4 weeks
+
+# After how long do we forget about reserves? Should be above
+# the legal expiration timeframe of withdrawn coins.
+LEGAL_RESERVE_EXPIRATION_TIME = 7 years
+
[account-1]
# What is the account URL?