[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 21/22: re-enabling 402 Failed Dependency f
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] 21/22: re-enabling 402 Failed Dependency from /track/transaction. |
Date: |
Sat, 17 Mar 2018 01:58:46 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
commit c63fcc52cabfdb098e058c000f507851f2308c84
Author: Marcello Stanisci <address@hidden>
AuthorDate: Sat Mar 17 01:25:56 2018 +0100
re-enabling 402 Failed Dependency from /track/transaction.
---
src/lib/test_merchant_api_twisted.c | 34 +++++++++++++++-------------------
1 file changed, 15 insertions(+), 19 deletions(-)
diff --git a/src/lib/test_merchant_api_twisted.c
b/src/lib/test_merchant_api_twisted.c
index 1882aa2..6ab7d19 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -395,12 +395,12 @@ run (void *cls,
10), // nrows
- #ifdef TEST_FAILED_DEPENDENCY
/**
* Move money to the exchange's bank account.
*/
CMD_TRANSFER_TO_EXCHANGE ("create-reserve-1",
"EUR:2.02"),
+
/**
* Make a reserve exist, according to the previous
* transfer.
@@ -417,28 +417,27 @@ run (void *cls,
"create-reserve-1",
"EUR:1",
MHD_HTTP_OK),
-
TALER_TESTING_cmd_withdraw_amount ("withdraw-coin-2",
is->exchange,
"create-reserve-1",
"EUR:1",
MHD_HTTP_OK),
-
TALER_TESTING_cmd_status ("withdraw-status",
is->exchange,
"create-reserve-1",
"EUR:0",
MHD_HTTP_OK),
+
TALER_TESTING_cmd_proposal
- ("create-proposal-1",
- merchant_url,
+ ("create-proposal-6",
+ twister_merchant_url,
is->ctx,
MHD_HTTP_OK,
"{\"max_fee\":\
{\"currency\":\"EUR\",\
\"value\":0,\
\"fraction\":50000000},\
- \"order_id\":\"1\",\
+ \"order_id\":\"11\",\
\"refund_deadline\":\"\\/Date(0)\\/\",\
\"pay_deadline\":\"\\/Date(99999999999)\\/\",\
\"amount\":\
@@ -451,17 +450,17 @@ run (void *cls,
NULL),
TALER_TESTING_cmd_check_payment ("check-payment-1",
- merchant_url,
+ twister_merchant_url,
is->ctx,
MHD_HTTP_OK,
- "create-proposal-1",
+ "create-proposal-6",
GNUNET_NO),
TALER_TESTING_cmd_pay ("deposit-simple",
- merchant_url,
+ twister_merchant_url,
is->ctx,
MHD_HTTP_OK,
- "create-proposal-1",
+ "create-proposal-6",
"withdraw-coin-1;" \
"withdraw-coin-2",
"EUR:2",
@@ -469,17 +468,17 @@ run (void *cls,
"EUR:0.01"), // no sense now
TALER_TESTING_cmd_check_payment ("check-payment-2",
- merchant_url,
+ twister_merchant_url,
is->ctx,
MHD_HTTP_OK,
- "create-proposal-1",
+ "create-proposal-6",
GNUNET_YES),
CMD_EXEC_AGGREGATOR ("run-aggregator"),
TALER_TESTING_cmd_check_bank_transfer
("check_bank_transfer-1",
- exchange_url,
+ twister_exchange_url,
/* paid, 1.97 =
brutto 2.00 -
deposit fee 0.01 * 2 -
@@ -488,27 +487,24 @@ run (void *cls,
"EUR:1.97", 2, 62),
/* Should instead change the response body somehow! */
-
TALER_TESTING_cmd_modify_object ("hack-0",
- CONFIG_FILE,
+ PROXY_EXCHANGE_CONFIG_FILE,
"total",
"EUR:0.98"),
TALER_TESTING_cmd_delete_object ("hack-1",
- CONFIG_FILE,
+ PROXY_EXCHANGE_CONFIG_FILE,
"deposits.0"),
TALER_TESTING_cmd_merchant_track_transaction
("track-transaction-1",
- merchant_url,
+ twister_merchant_url,
is->ctx,
MHD_HTTP_FAILED_DEPENDENCY,
"check_bank_transfer-1",
"deposit-simple",
"EUR:0.01"), // ignored
- #endif
-
/**
* End the suite. Fixme: better to have a label for this
* too, as it shows a "(null)" token on logs.
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-merchant] 19/22: unparsable response for proposal-lookup., (continued)
- [GNUnet-SVN] [taler-merchant] 19/22: unparsable response for proposal-lookup., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 06/22: multicoin check paid., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 09/22: trigger 424 confict caused by exchange., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 10/22: do not treat 424 Failed Dependency as "unexpected"., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 20/22: cause invalid proposal-lookup response., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 03/22: comments, gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 14/22: /proposal cb called with response code == 0., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 22/22: fulfillment URL mandatory., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 11/22: typo, gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 05/22: fix multi-coin payment., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 21/22: re-enabling 402 Failed Dependency from /track/transaction.,
gnunet <=
- [GNUnet-SVN] [taler-merchant] 15/22: test against invalid proposal., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 02/22: preparing to HTTP response body modification., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 13/22: malforming /history response body, and avoid extracting error codes from NULL responses., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 17/22: trigger 404 @ /proposal, gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 16/22: be more gentle with unexpected response codes., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 18/22: proposal-lookup 404 Not Found., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 12/22: Double twister instance plus first coverage effort, gnunet, 2018/03/16