merchant

commit bd9eed9ddec559375ab2b54af3e25c0189efd5bf
parent 552e5882589fe22838bd2519a2491d4b4d2cdce3
Author: Christian Grothoff <christian@grothoff.org>
Date:   Tue, 31 May 2016 20:45:26 +0200

comment out /track/deposit test from marcello, as code is incomplete

Diffstat:
M
src/lib/merchant_api_track.c
 | 
7
+++++--
M
src/lib/test_merchant_api.c
 | 
6
+++---

2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/src/lib/merchant_api_track.c b/src/lib/merchant_api_track.c
@@ -93,13 +93,15 @@ handle_trackdeposit_finished (void *cls,
   case MHD_HTTP_OK:
     {
     /* Work out argument for external callback from the body .. */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "200 returned from /track/deposit");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "200 returned from /track/deposit\n");
     }
     break;
   case MHD_HTTP_NOT_FOUND:
     /* Nothing really to verify, this should never
        happen, we should pass the JSON reply to the application */
-    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "track deposit URI not found");
+    GNUNET_log (GNUNET_ERROR_TYPE_DEBUG,
+                "track deposit URI not found\n");
     break;
   case MHD_HTTP_INTERNAL_SERVER_ERROR:
     /* Server had an internal issue; we should retry, but this API
@@ -166,6 +168,7 @@ TALER_MERCHANT_track_deposit (struct GNUNET_CURL_Context *ctx,
   return tdo;
 }
 
+
 /**
  * Cancel a /track/deposit request.  This function cannot be used
  * on a request handle if a response is already served for it.
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
@@ -1265,7 +1265,7 @@ interpreter_run (void *cls)
     return;
   case OC_TRACK_DEPOSIT:
     TALER_MERCHANT_track_deposit (ctx,
-                                  MERCHANT_URI "/track/deposit",
+                                  MERCHANT_URI "track/deposit",
                                   cmd->details.track_deposit.wtid,
                                   EXCHANGE_URI,
                                   track_deposit_cb,
@@ -1478,14 +1478,14 @@ run (void *cls)
   struct InterpreterState *is;
   static struct Command commands[] =
   {
-
+#if NEW_MARCELLO_CODE
     { .oc = OC_TRACK_DEPOSIT,
       .label = "track-deposit-1",
       .expected_response_code = MHD_HTTP_OK,
       .details.track_deposit.wtid = "TESTWTID"},
 
     { .oc = OC_END },
-
+#endif
     /* Fill reserve with EUR:5.01, as withdraw fee is 1 ct per config */
     { .oc = OC_ADMIN_ADD_INCOMING,
       .label = "create-reserve-1",