merchant

commit 68afddc411bc8a91a66e4d50c33137dde4d2ca81
parent 0c741d586c4dd57be07df8d7b8300688cca838c2
Author: Marcello Stanisci <stanisci.m@gmail.com>
Date:   Sat, 10 Mar 2018 15:01:22 +0100

do not treat 424 Failed Dependency as "unexpected".

Diffstat:
M
src/lib/merchant_api_track_transaction.c
 | 
4
++++
M
src/lib/test_merchant_api_twisted.c
 | 
2
+-
M
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
@@ -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
@@ -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
@@ -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);
 }