diff options
| author | Marcello Stanisci <stanisci.m@gmail.com> | 2019-04-04 12:14:25 +0200 |
|---|---|---|
| committer | Marcello Stanisci <stanisci.m@gmail.com> | 2019-04-04 12:14:25 +0200 |
| commit | 3e757cdeda7938d9d5f88bcc7b91deebaaf154ba (patch) | |
| tree | c820658fa30ed2010900e7d5dc41cd1b23131b79 /src/lib/test_exchange_api_keys_cherry_picking_new.c | |
| parent | ce71d83ad6b651b3cac43d131bf62afa1583bf67 (diff) | |
| download | exchange-3e757cdeda7938d9d5f88bcc7b91deebaaf154ba.tar.gz exchange-3e757cdeda7938d9d5f88bcc7b91deebaaf154ba.tar.bz2 exchange-3e757cdeda7938d9d5f88bcc7b91deebaaf154ba.zip | |
Inserting "now" argument into "/keys".
Also using this new logic from the cherry-pick test case.
Diffstat (limited to 'src/lib/test_exchange_api_keys_cherry_picking_new.c')
| -rw-r--r-- | src/lib/test_exchange_api_keys_cherry_picking_new.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/lib/test_exchange_api_keys_cherry_picking_new.c b/src/lib/test_exchange_api_keys_cherry_picking_new.c index 9760d91ba..ccfb93a3a 100644 --- a/src/lib/test_exchange_api_keys_cherry_picking_new.c +++ b/src/lib/test_exchange_api_keys_cherry_picking_new.c @@ -151,6 +151,7 @@ run (void *cls, }; + now = GNUNET_TIME_absolute_get (); struct TALER_TESTING_Command ordinary_cherry_pick[] = { /* Trigger keys reloading from disk. */ @@ -164,11 +165,12 @@ run (void *cls, 1, /* generation */ 1), /** - * We now set lookahead_sign to 90s, and fake 10s passed. + * We now set lookahead_sign to 90s, and expect a new DK + * to be created. The first one lives (= has withdraw_duration of) + * only 80s. */ - TALER_TESTING_cmd_exec_keyup_with_now ("keyup-2", - CONFIG_FILE_EXTENDED, - NOWPLUSSECS (10)), + TALER_TESTING_cmd_exec_keyup ("keyup-2", + CONFIG_FILE_EXTENDED), TALER_TESTING_cmd_exec_auditor_sign ("sign-keys-1", CONFIG_FILE_EXTENDED), @@ -177,19 +179,15 @@ run (void *cls, is->exchanged, SIGUSR1), /** - * First DK has still 70s of remaining life - * (duration_withdraw), so it's not enough to cover the new - * 90s window, so a new one should be created. * Total 2 DKs. */ TALER_TESTING_cmd_check_keys ("check-keys-2", 2, /* generation */ 2), - /* Must fake 20s lapse now. */ - TALER_TESTING_cmd_exec_keyup_with_now ("keyup-3", - CONFIG_FILE_EXTENDED, - NOWPLUSSECS (20)), + /* Nothing should happen now. */ + TALER_TESTING_cmd_exec_keyup ("keyup-3", + CONFIG_FILE_EXTENDED), TALER_TESTING_cmd_exec_auditor_sign ("sign-keys-2", CONFIG_FILE), TALER_TESTING_cmd_signal ("trigger-keys-reload-2", @@ -197,13 +195,15 @@ run (void *cls, SIGUSR1), /** - * First DK has 50s of remaining life (duration_withdraw). - * The second DK has ~60s of remaining life, therefore two - * keys should be (still) returned. + * Make 30s time lapse (by passing the "now" argument to + * "/keys"). First DK has 50s of remaining life + * (duration_withdraw). The second DK has ~60s of remaining + * life, therefore two keys should be (still) returned. */ - TALER_TESTING_cmd_check_keys ("check-keys-3", - 3, - 2), + TALER_TESTING_cmd_check_keys_with_now ("check-keys-3", + 3, + 2, + NOWPLUSSECS (30)), TALER_TESTING_cmd_end () }; struct TALER_TESTING_Command commands[] = { |