diff options
author | Christian Grothoff <christian@grothoff.org> | 2019-09-05 10:59:03 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2019-09-05 10:59:03 +0200 |
commit | 997b40e7052474b6e7b6924291bb7c7b120c2690 (patch) | |
tree | 76186f7fe880de1096f9d3ab06258f57ba763855 | |
parent | 8e9ce98661ed402ec4e037b4812feec893c151be (diff) | |
download | exchange-997b40e7052474b6e7b6924291bb7c7b120c2690.tar.gz exchange-997b40e7052474b6e7b6924291bb7c7b120c2690.zip |
fix tests
-rwxr-xr-x | src/auditor/test-auditor.sh | 1 | ||||
-rw-r--r-- | src/auditordb/test-auditor-db-postgres.conf | 3 | ||||
-rw-r--r-- | src/exchange/test-taler-exchange-aggregator-postgres.conf | 14 |
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 | |||
944 | exit_fail "Reported table wrong: $TABLE" | 944 | exit_fail "Reported table wrong: $TABLE" |
945 | fi | 945 | fi |
946 | DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json` | 946 | DIAG=`jq -r .row_minor_inconsistencies[0].diagnostic < test-wire-audit.json` |
947 | DIAG=`echo "$DIAG" | awk '{print $1 " " $2 " " $3}'` | ||
947 | if test "x$DIAG" != "xexecution date missmatch" | 948 | if test "x$DIAG" != "xexecution date missmatch" |
948 | then | 949 | then |
949 | exit_fail "Reported diagnostic wrong: $DIAG" | 950 | 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 | |||
7 | CONFIG = "postgres:///talercheck" | 7 | CONFIG = "postgres:///talercheck" |
8 | 8 | ||
9 | [taler] | 9 | [taler] |
10 | CURRENCY = "EUR" \ No newline at end of file | 10 | CURRENCY = "EUR" |
11 | |||
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 | |||
35 | CONFIG = postgres:///talercheck | 35 | CONFIG = postgres:///talercheck |
36 | 36 | ||
37 | 37 | ||
38 | [exchangedb] | ||
39 | |||
40 | # After how long do we close idle reserves? The exchange | ||
41 | # and the auditor must agree on this value. We currently | ||
42 | # expect it to be globally defined for the whole system, | ||
43 | # as there is no way for wallets to query this value. Thus, | ||
44 | # it is only configurable for testing, and should be treated | ||
45 | # as constant in production. | ||
46 | IDLE_RESERVE_EXPIRATION_TIME = 4 weeks | ||
47 | |||
48 | # After how long do we forget about reserves? Should be above | ||
49 | # the legal expiration timeframe of withdrawn coins. | ||
50 | LEGAL_RESERVE_EXPIRATION_TIME = 7 years | ||
51 | |||
38 | [account-1] | 52 | [account-1] |
39 | 53 | ||
40 | # What is the account URL? | 54 | # What is the account URL? |