aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcello Stanisci <stanisci.m@gmail.com>2018-05-24 15:55:35 +0200
committerMarcello Stanisci <stanisci.m@gmail.com>2018-05-24 15:55:35 +0200
commit041ad71e176ddbdd246e710d2b8ac326d439639b (patch)
tree34a8884eedd22e7c698a08f29bd1e4269ce1b640
parentafceb5b1c993b9429a620bec61b8eafc71ce144a (diff)
downloadmerchant-041ad71e176ddbdd246e710d2b8ac326d439639b.tar.gz
merchant-041ad71e176ddbdd246e710d2b8ac326d439639b.tar.bz2
merchant-041ad71e176ddbdd246e710d2b8ac326d439639b.zip
Fix bugs strongly related to #5330.
-rw-r--r--src/lib/test_merchant_api_new.c21
-rw-r--r--src/lib/test_merchant_api_twisted.c2
2 files changed, 13 insertions, 10 deletions
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index e6d0c008..75009819 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -977,25 +977,28 @@ run (void *cls,
\"value\":\"{EUR:10}\"} ] }",
NULL),
- /* This CMD will (1) successfully deposit `withdraw-coin-11a'
- * and subsequently _fail_ to deposit `withdraw-coin-1',
- * because of double spending. The abort CMD then will try
- * to get a refund permission out of that first coin that
- * was regularly spent, and eventually abort refund CMD, will
- * get the actual refund coin from the exchange. */
- TALER_TESTING_cmd_pay ("pay-fail-partial-double-11",
+ TALER_TESTING_cmd_pay ("pay-fail-partial-double-11-good",
+ merchant_url,
+ is->ctx,
+ MHD_HTTP_NOT_ACCEPTABLE,
+ "create-proposal-11",
+ "withdraw-coin-11a",
+ "EUR:5",
+ "EUR:4.99",
+ "EUR:0.01"),
+ TALER_TESTING_cmd_pay ("pay-fail-partial-double-11-bad",
merchant_url,
is->ctx,
MHD_HTTP_FORBIDDEN,
"create-proposal-11",
- "withdraw-coin-11a;withdraw-coin-1",
+ "withdraw-coin-1",
"EUR:5",
"EUR:4.99",
"EUR:0.01"),
TALER_TESTING_cmd_pay_abort ("pay-abort-11",
merchant_url,
- "pay-fail-partial-double-11",
+ "pay-fail-partial-double-11-good",
is->ctx,
MHD_HTTP_OK),
diff --git a/src/lib/test_merchant_api_twisted.c b/src/lib/test_merchant_api_twisted.c
index cd9adb9d..09eb771a 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -635,7 +635,7 @@ run (void *cls,
TALER_TESTING_cmd_pay ("deposit-simple-for-abort",
twister_merchant_url,
is->ctx,
- 0,
+ MHD_HTTP_NOT_ACCEPTABLE,
"create-proposal-abort-1",
"withdraw-coin-abort-1",
"EUR:1",