[GNUnet-SVN] [taler-merchant] branch master updated (7305041 -> cbd2ca3)

[gnunet]

This is an automated email from the git hooks/post-receive script.

marcello pushed a change to branch master
in repository merchant.

    from 7305041  Towards #5366..
     new 8330ab8  cosmetics
     new cbd2ca3  Reproducing #5366 within test cases.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 src/lib/test_merchant_api_new.c  | 73 ++++++++++++++++++++++++++++++++++++++++
 src/lib/testing_api_cmd_rewind.c |  1 -
 2 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index 17fcd5b..9912b19 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -335,6 +335,76 @@ run (void *cls,
     TALER_TESTING_cmd_end ()
   };
 
+  /**
+   * This block tests whether a refund_deadline and/or
+   * wire_transfer_deadline very far in the future do NOT
+   * result in any wire transfer from the aggregator (#5366).
+   */
+  struct TALER_TESTING_Command unaggregation[] = {
+
+    CMD_TRANSFER_TO_EXCHANGE
+      ("create-reserve-unaggregation",
+       "EUR:5.01"),
+
+    CMD_EXEC_WIREWATCH
+      ("wirewatch-unaggregation"),
+
+    TALER_TESTING_cmd_check_bank_transfer
+      ("check_bank_transfer-unaggregation",
+       EXCHANGE_URL,
+       "EUR:5.01",
+       USER_ACCOUNT_NO,
+       EXCHANGE_ACCOUNT_NO),
+
+    TALER_TESTING_cmd_withdraw_amount
+      ("withdraw-coin-unaggregation",
+       is->exchange,
+       "create-reserve-unaggregation",
+       "EUR:5",
+       MHD_HTTP_OK),
+
+    TALER_TESTING_cmd_proposal
+      ("create-proposal-unaggregation",
+       merchant_url,
+       is->ctx,
+       MHD_HTTP_OK,
+       "{\"max_fee\":\
+          {\"currency\":\"EUR\",\
+           \"value\":0,\
+           \"fraction\":50000000},\
+        \"refund_deadline\":\"\\/Date(2)\\/\",\
+        \"pay_deadline\":\"\\/Date(1)\\/\",\
+        \"wire_transfer_delay\":\"\\/Delay(3)\\/\",\
+        \"amount\":\
+          {\"currency\":\"EUR\",\
+           \"value\":5,\
+           \"fraction\":0},\
+        \"summary\": \"unaggregated product\",\
+        \"fulfillment_url\": \"https://example.com/\",\
+        \"products\": [ {\"description\":\"unaggregated cream\",\
+                         \"value\":\"{EUR:5}\"} ] }",
+        NULL),
+
+    TALER_TESTING_cmd_pay
+      ("pay-unaggregation",
+       merchant_url,
+       is->ctx,
+       MHD_HTTP_OK,
+       "create-proposal-unaggregation",
+       "withdraw-coin-unaggregation",
+       "EUR:5", // amount + fee
+       "EUR:4.99", // amount - fee
+       "EUR:0.01"), // refund fee
+
+    CMD_EXEC_AGGREGATOR
+      ("aggregation-attempt"),
+
+    TALER_TESTING_cmd_check_bank_empty
+      ("check_bank_unaggregated"),
+
+    TALER_TESTING_cmd_end ()
+  };
+
   struct TALER_TESTING_Command track[] = {
 
     TALER_TESTING_cmd_merchant_track_transaction
@@ -1050,6 +1120,9 @@ run (void *cls,
     TALER_TESTING_cmd_batch ("double-spending",
                              double_spending),
 
+    TALER_TESTING_cmd_batch ("unaggregation",
+                             unaggregation),
+
     TALER_TESTING_cmd_batch ("track",
                              track),
 
diff --git a/src/lib/testing_api_cmd_rewind.c b/src/lib/testing_api_cmd_rewind.c
index de8bb73..6572e23 100644
--- a/src/lib/testing_api_cmd_rewind.c
+++ b/src/lib/testing_api_cmd_rewind.c
@@ -116,4 +116,3 @@ TALER_TESTING_cmd_rewind_ip
 
   return cmd;
 }
-

-- 
To stop receiving notification emails like this one, please contact
address@hidden