fix #6861, maybe #6854

16 files changed, 89 insertions, 28 deletions

diff --git a/src/testing/testing_api_cmd_delete_instance.c b/src/testing/testing_api_cmd_delete_instance.c
index ca2acb76..9d3bd7d5 100644
--- a/src/testing/testing_api_cmd_delete_instance.c
+++ b/src/testing/testing_api_cmd_delete_instance.c
@@ -100,7 +100,8 @@ delete_instance_cb (void *cls,
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %d for DELETE instance.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (dis->is);
 }
diff --git a/src/testing/testing_api_cmd_delete_order.c b/src/testing/testing_api_cmd_delete_order.c
index 6d97b611..d5d8b283 100644
--- a/src/testing/testing_api_cmd_delete_order.c
+++ b/src/testing/testing_api_cmd_delete_order.c
@@ -98,7 +98,7 @@ delete_order_cb (void *cls,
   default:
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status %d.\n",
+                "Unhandled HTTP status %u for DELETE order.\n",
                 hr->http_status);
   }
   TALER_TESTING_interpreter_next (dos->is);
diff --git a/src/testing/testing_api_cmd_delete_product.c b/src/testing/testing_api_cmd_delete_product.c
index d5a724fe..6fed8d46 100644
--- a/src/testing/testing_api_cmd_delete_product.c
+++ b/src/testing/testing_api_cmd_delete_product.c
@@ -87,11 +87,18 @@ delete_product_cb (void *cls,
   }
   switch (hr->http_status)
   {
-  case MHD_HTTP_OK:
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
+  case MHD_HTTP_CONFLICT:
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for DELETE product.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (dis->is);
 }
diff --git a/src/testing/testing_api_cmd_delete_reserve.c b/src/testing/testing_api_cmd_delete_reserve.c
index fe95277e..d98b688a 100644
--- a/src/testing/testing_api_cmd_delete_reserve.c
+++ b/src/testing/testing_api_cmd_delete_reserve.c
@@ -100,7 +100,8 @@ delete_reserve_cb (void *cls,
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for DELETE reserve.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (drs->is);
 }
diff --git a/src/testing/testing_api_cmd_get_instance.c b/src/testing/testing_api_cmd_get_instance.c
index 7b4ee094..6622b2ec 100644
--- a/src/testing/testing_api_cmd_get_instance.c
+++ b/src/testing/testing_api_cmd_get_instance.c
@@ -325,9 +325,14 @@ get_instance_cb (void *cls,
       }
     }
     break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for GET instance ID.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (gis->is);
 }
diff --git a/src/testing/testing_api_cmd_get_instances.c b/src/testing/testing_api_cmd_get_instances.c
index ff900b87..0e3342e6 100644
--- a/src/testing/testing_api_cmd_get_instances.c
+++ b/src/testing/testing_api_cmd_get_instances.c
@@ -161,7 +161,8 @@ get_instances_cb (void *cls,
     break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for GET /instances.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (gis->is);
 }
diff --git a/src/testing/testing_api_cmd_lock_product.c b/src/testing/testing_api_cmd_lock_product.c
index a61f1bd4..abb5920c 100644
--- a/src/testing/testing_api_cmd_lock_product.c
+++ b/src/testing/testing_api_cmd_lock_product.c
@@ -102,12 +102,18 @@ lock_product_cb (void *cls,
   }
   switch (hr->http_status)
   {
-  case MHD_HTTP_OK:
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
+  case MHD_HTTP_GONE:
     break;
-  // FIXME: add other legitimate states here...
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for lock product.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (pis->is);
 }
diff --git a/src/testing/testing_api_cmd_merchant_get_order.c b/src/testing/testing_api_cmd_merchant_get_order.c
index c08dd56e..ed8b966b 100644
--- a/src/testing/testing_api_cmd_merchant_get_order.c
+++ b/src/testing/testing_api_cmd_merchant_get_order.c
@@ -118,7 +118,8 @@ apply_forget (void *cls,
               json_t *parent)
 {
   int *res = cls;
-  if (GNUNET_OK !=
+
+  if (GNUNET_SYSERR ==
       TALER_JSON_contract_part_forget (parent,
                                        object_id))
     *res = GNUNET_SYSERR;
diff --git a/src/testing/testing_api_cmd_patch_instance.c b/src/testing/testing_api_cmd_patch_instance.c
index a7a82ef7..3d4b93d1 100644
--- a/src/testing/testing_api_cmd_patch_instance.c
+++ b/src/testing/testing_api_cmd_patch_instance.c
@@ -139,10 +139,15 @@ patch_instance_cb (void *cls,
   {
   case MHD_HTTP_NO_CONTENT:
     break;
-  // FIXME: add other legitimate states here...
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
+  case MHD_HTTP_CONFLICT:
+    break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status %u.\n",
+                "Unhandled HTTP status %u for PATCH instance.\n",
                 hr->http_status);
   }
   TALER_TESTING_interpreter_next (pis->is);
diff --git a/src/testing/testing_api_cmd_patch_product.c b/src/testing/testing_api_cmd_patch_product.c
index 6e4613df..ed64d8f3 100644
--- a/src/testing/testing_api_cmd_patch_product.c
+++ b/src/testing/testing_api_cmd_patch_product.c
@@ -137,12 +137,20 @@ patch_product_cb (void *cls,
   }
   switch (hr->http_status)
   {
-  case MHD_HTTP_OK:
+  case MHD_HTTP_NO_CONTENT:
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
+  case MHD_HTTP_CONFLICT:
     break;
-  // FIXME: add other legitimate states here...
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for PATCH /products/ID.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (pis->is);
 }
diff --git a/src/testing/testing_api_cmd_post_instances.c b/src/testing/testing_api_cmd_post_instances.c
index 7eb2e7fa..8961d4e0 100644
--- a/src/testing/testing_api_cmd_post_instances.c
+++ b/src/testing/testing_api_cmd_post_instances.c
@@ -144,13 +144,18 @@ post_instances_cb (void *cls,
   {
   case MHD_HTTP_NO_CONTENT:
     break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
   case MHD_HTTP_CONFLICT:
     break;
-  // FIXME: add other legitimate states here...
   default:
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status %u.\n",
+                "Unhandled HTTP status %u for POST instances.\n",
                 hr->http_status);
   }
   TALER_TESTING_interpreter_next (pis->is);
diff --git a/src/testing/testing_api_cmd_post_orders.c b/src/testing/testing_api_cmd_post_orders.c
index 4cbb17b0..5b9e533f 100644
--- a/src/testing/testing_api_cmd_post_orders.c
+++ b/src/testing/testing_api_cmd_post_orders.c
@@ -677,7 +677,6 @@ make_order_json (const char *order_id,
                                          "$.dummy_array[*].item",
                                          &mark_forgettable,
                                          NULL));
-
   *order = json_dumps (contract_terms, 0);
   json_decref (contract_terms);
 }
diff --git a/src/testing/testing_api_cmd_post_products.c b/src/testing/testing_api_cmd_post_products.c
index 1a358a7e..5d1abb48 100644
--- a/src/testing/testing_api_cmd_post_products.c
+++ b/src/testing/testing_api_cmd_post_products.c
@@ -134,13 +134,19 @@ post_products_cb (void *cls,
   {
   case MHD_HTTP_NO_CONTENT:
     break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
   case MHD_HTTP_CONFLICT:
     break;
-  // FIXME: add other legitimate states here...
   default:
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for POST /products.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (pis->is);
 }
diff --git a/src/testing/testing_api_cmd_post_reserves.c b/src/testing/testing_api_cmd_post_reserves.c
index 4f18dbde..31866384 100644
--- a/src/testing/testing_api_cmd_post_reserves.c
+++ b/src/testing/testing_api_cmd_post_reserves.c
@@ -104,17 +104,18 @@ post_reserves_cb (void *cls,
   }
   switch (hr->http_status)
   {
-  case MHD_HTTP_NO_CONTENT:
+  case MHD_HTTP_OK:
     break;
-  case MHD_HTTP_CONFLICT:
+  case MHD_HTTP_ACCEPTED:
     break;
-  case MHD_HTTP_OK:
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_NOT_FOUND:
     break;
-  // FIXME: add other legitimate states here...
   default:
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status (%d).\n",
+                "Unhandled HTTP status %u for POST /reserves.\n",
                 hr->http_status);
   }
   prs->reserve_pub = *reserve_pub;
diff --git a/src/testing/testing_api_cmd_post_transfers.c b/src/testing/testing_api_cmd_post_transfers.c
index 1fa9dfc0..72b6f132 100644
--- a/src/testing/testing_api_cmd_post_transfers.c
+++ b/src/testing/testing_api_cmd_post_transfers.c
@@ -298,10 +298,16 @@ transfers_cb (void *cls,
 #endif
       break;
     }
+  case MHD_HTTP_ACCEPTED:
+    break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
   default:
     GNUNET_break (0);
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status %d.\n",
+                "Unhandled HTTP status %u for POST /transfers.\n",
                 hr->http_status);
   }
   TALER_TESTING_interpreter_next (pts->is);
diff --git a/src/testing/testing_api_cmd_refund_order.c b/src/testing/testing_api_cmd_refund_order.c
index 309c33a8..fd06f887 100644
--- a/src/testing/testing_api_cmd_refund_order.c
+++ b/src/testing/testing_api_cmd_refund_order.c
@@ -154,9 +154,18 @@ refund_cb (void *cls,
       TALER_MERCHANT_parse_refund_uri_free (&rud);
     }
     break;
+  case MHD_HTTP_UNAUTHORIZED:
+    break;
+  case MHD_HTTP_FORBIDDEN:
+    break;
+  case MHD_HTTP_NOT_FOUND:
+    break;
+  case MHD_HTTP_CONFLICT:
+    break;
   default:
     GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
-                "Unhandled HTTP status.\n");
+                "Unhandled HTTP status %u for refund order.\n",
+                hr->http_status);
   }
   TALER_TESTING_interpreter_next (ris->is);
 }