From 6e3765d85253867fcc8cb6409ac65d0dd637c479 Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Tue, 10 Mar 2020 18:51:08 +0100 Subject: more careful use of TALER_JSON_get_error_code(), limit to cases where we expect to get one --- .../test_exchange_api_keys_cherry_picking.c | 22 ++++++++++++---------- ...xchange_api_keys_cherry_picking_extended_2.conf | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) (limited to 'src/testing') diff --git a/src/testing/test_exchange_api_keys_cherry_picking.c b/src/testing/test_exchange_api_keys_cherry_picking.c index a9f6e3d89..47a6472a0 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking.c +++ b/src/testing/test_exchange_api_keys_cherry_picking.c @@ -3,7 +3,8 @@ Copyright (C) 2018 Taler Systems SA TALER is free software; you can redistribute it and/or modify it - under the terms of the GNU General Public License as published + under the terms of the GNU General Public License as pub +lished by the Free Software Foundation; either version 3, or (at your option) any later version. @@ -53,7 +54,7 @@ "test_exchange_api_keys_cherry_picking_extended_2.conf" -#define NDKS_RIGHT_BEFORE_SERIALIZATION 46 +#define NDKS_RIGHT_BEFORE_SERIALIZATION 40 /** * Add seconds. @@ -187,20 +188,21 @@ run (void *cls, /** * Expected number of DK: * - * 3500 (the lookahead_sign time frame, in seconds) - * - 69 (how many seconds are covered by the latest DK) + * 3000 (the lookahead_sign time frame, in seconds) + * - 69 (how many seconds are covered by the latest DK, 79s - 10s already past) * ---- - * 3431 - * / 79 (how many seconds each DK will cover) + * 2931 + * / 79 (how many seconds each DK will cover, 80-1) * ---- - * 44 (rounded up) + * 38 (rounded up) * + 2 (old DKs already stored locally: 1 from the * very initial setup, and 1 from the 'keyup-1' CMD) * ---- - * 46 - */TALER_TESTING_cmd_check_keys_with_now + * 40 + */// + TALER_TESTING_cmd_check_keys_with_now ("check-keys-3", - 3, + 3 /* generation */, NDKS_RIGHT_BEFORE_SERIALIZATION, TTH_parse_time (JAN2030)), diff --git a/src/testing/test_exchange_api_keys_cherry_picking_extended_2.conf b/src/testing/test_exchange_api_keys_cherry_picking_extended_2.conf index 8097a6cda..9ba5c6181 100644 --- a/src/testing/test_exchange_api_keys_cherry_picking_extended_2.conf +++ b/src/testing/test_exchange_api_keys_cherry_picking_extended_2.conf @@ -1,5 +1,5 @@ @INLINE@ test_exchange_api_keys_cherry_picking_extended.conf [exchange] -# Lengthen over firstly extended value (100 s) -LOOKAHEAD_SIGN = 3500 s +# Lengthen over firstly extended value (90 s) +LOOKAHEAD_SIGN = 3000 s -- cgit v1.2.3