From 8ec523afbba274a0979eb2c0696c30c3e13fc919 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Wed, 16 May 2018 13:18:23 +0200 Subject: Triggering 409 Conflict for /refresh/reveal --- src/exchange-lib/test_exchange_api_twisted.c | 24 +++++++++++++++++------- src/exchange-lib/test_exchange_api_twisted.conf | 4 +--- src/include/taler_error_codes.h | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/src/exchange-lib/test_exchange_api_twisted.c b/src/exchange-lib/test_exchange_api_twisted.c index 3b875cd5e..762f124b3 100644 --- a/src/exchange-lib/test_exchange_api_twisted.c +++ b/src/exchange-lib/test_exchange_api_twisted.c @@ -142,13 +142,15 @@ run (void *cls, struct TALER_TESTING_Command commands[] = { - CMD_TRANSFER_TO_EXCHANGE ("refresh-create-reserve", - "EUR:5.01"), + CMD_TRANSFER_TO_EXCHANGE + ("refresh-create-reserve", + "EUR:5.01"), /** * Make previous command effective. */ - CMD_EXEC_WIREWATCH ("wirewatch"), + CMD_EXEC_WIREWATCH + ("wirewatch"), /** * Withdraw EUR:5. @@ -184,10 +186,18 @@ run (void *cls, "refresh-withdraw-coin", MHD_HTTP_OK), - /** - * End the suite. Fixme: better to have a label for this - * too, as it shows a "(null)" token on logs. - */ + /* Trigger 409 Conflict. */ + TALER_TESTING_cmd_flip_upload + ("flip-upload", + CONFIG_FILE, + "transfer_privs.0"), + + TALER_TESTING_cmd_refresh_reveal + ("refresh-(flipped-)reveal", + is->exchange, + "refresh-melt", + MHD_HTTP_CONFLICT), + TALER_TESTING_cmd_end () }; diff --git a/src/exchange-lib/test_exchange_api_twisted.conf b/src/exchange-lib/test_exchange_api_twisted.conf index d64ea6596..142dd99f9 100644 --- a/src/exchange-lib/test_exchange_api_twisted.conf +++ b/src/exchange-lib/test_exchange_api_twisted.conf @@ -49,8 +49,6 @@ lookahead_sign = 32 weeks 1 day # ahead of time? lookahead_provide = 4 weeks 1 day - - [exchange] # HTTP port the exchange listens to @@ -67,7 +65,7 @@ DB = postgres # connection addressed to the exchange. In fact, the presence # of the twister is 100% transparent to the test case, as it # only seeks the exchange/BASE_URL URL to connect to the exchange. -BASE_URL = "http://localhost:8081/" +BASE_URL = "http://localhost:8888/" [exchangedb-postgres] DB_CONN_STR = "postgres:///talercheck" diff --git a/src/include/taler_error_codes.h b/src/include/taler_error_codes.h index dbde04df1..8f082ecd8 100644 --- a/src/include/taler_error_codes.h +++ b/src/include/taler_error_codes.h @@ -530,7 +530,7 @@ enum TALER_ErrorCode TALER_EC_REFRESH_REVEAL_SIGNING_ERROR = 1351, /** - * The exchange is unaware of the refresh sessino specified in + * The exchange is unaware of the refresh session specified in * the request. * This response is provided with HTTP status code * MHD_HTTP_BAD_REQUEST. -- cgit v1.2.3