[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 10/22: do not treat 424 Failed Dependency
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-merchant] 10/22: do not treat 424 Failed Dependency as "unexpected". |
Date: |
Sat, 17 Mar 2018 01:58:35 +0100 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository merchant.
commit 68afddc411bc8a91a66e4d50c33137dde4d2ca81
Author: Marcello Stanisci <address@hidden>
AuthorDate: Sat Mar 10 15:01:22 2018 +0100
do not treat 424 Failed Dependency as "unexpected".
---
src/lib/merchant_api_track_transaction.c | 4 ++++
src/lib/test_merchant_api_twisted.c | 2 +-
src/lib/testing_api_cmd_track.c | 6 +++---
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/lib/merchant_api_track_transaction.c
b/src/lib/merchant_api_track_transaction.c
index e38660c..ae5d903 100644
--- a/src/lib/merchant_api_track_transaction.c
+++ b/src/lib/merchant_api_track_transaction.c
@@ -97,6 +97,10 @@ handle_track_transaction_finished (void *cls,
/* Expect time stamp of when the transfer is supposed to happen */
}
break;
+ case MHD_HTTP_FAILED_DEPENDENCY:
+ GNUNET_log (GNUNET_ERROR_TYPE_INFO,
+ "Exchange gave inconsistent response\n");
+ break;
case MHD_HTTP_NOT_FOUND:
/* Nothing really to verify, this should never
happen, we should pass the JSON reply to the application */
diff --git a/src/lib/test_merchant_api_twisted.c
b/src/lib/test_merchant_api_twisted.c
index 344004d..c70c5fc 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -264,7 +264,7 @@ run (void *cls,
("track-transaction-1",
merchant_url,
is->ctx,
- MHD_HTTP_OK,
+ MHD_HTTP_FAILED_DEPENDENCY,
"check_bank_transfer-1",
"deposit-simple",
"EUR:0.01"), // ignored
diff --git a/src/lib/testing_api_cmd_track.c b/src/lib/testing_api_cmd_track.c
index e665373..f3d6338 100644
--- a/src/lib/testing_api_cmd_track.c
+++ b/src/lib/testing_api_cmd_track.c
@@ -101,9 +101,9 @@ track_transaction_cb (void *cls,
TALER_TESTING_interpreter_fail (tts->is);
return;
}
- if (MHD_HTTP_OK != http_status)
- TALER_TESTING_FAIL (tts->is);
-
+ GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+ "/track/transaction, response code: %u\n",
+ http_status);
TALER_TESTING_interpreter_next (tts->is);
}
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-merchant] branch master updated (6f5656a -> 0b14a3f), gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 04/22: check if twister is installed., gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 01/22: re-enable twisted tests, gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 08/22: trigger 424, gnunet, 2018/03/16
- [GNUnet-SVN] [taler-merchant] 07/22: enabling twisted command., gnunet, 2018/03/16
- [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 <=
- [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, 2018/03/16
- [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