[taler-merchant] branch master updated: -fix expected status code

[gnunet]

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

grothoff pushed a commit to branch master
in repository merchant.

The following commit(s) were added to refs/heads/master by this push:
     new b2dab8c5 -fix expected status code
b2dab8c5 is described below

commit b2dab8c5d1597ff84c16b2c0d641808a180f7fb3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 30 21:10:58 2021 +0200

    -fix expected status code
---
 src/testing/test_merchant_api.c                                       | 4 ++--
 .../test_reducer_home/.local/share/taler/exchange-offline/master.priv | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/testing/test_merchant_api.c b/src/testing/test_merchant_api.c
index 87a341d5..86f665a4 100644
--- a/src/testing/test_merchant_api.c
+++ b/src/testing/test_merchant_api.c
@@ -1313,7 +1313,7 @@ run (void *cls,
                                                "USD:0.5",
                                                GNUNET_TIME_UNIT_MINUTES,
                                                GNUNET_TIME_UNIT_MINUTES,
-                                               MHD_HTTP_CONFLICT),
+                                               MHD_HTTP_BAD_REQUEST),
     TALER_TESTING_cmd_merchant_patch_instance ("instance-patch-i1",
                                                merchant_url,
                                                "i1",
@@ -1379,7 +1379,7 @@ run (void *cls,
                                                "i2",
                                                PAYTO_I1,
                                                "USD",
-                                               MHD_HTTP_CONFLICT),
+                                               MHD_HTTP_BAD_REQUEST),
     TALER_TESTING_cmd_merchant_post_instances2 ("instance-create-ACL",
                                                 merchant_url,
                                                 "i-acl",
diff --git 
a/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv 
b/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
index 35575146..6463d34c 100644
--- 
a/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
+++ 
b/src/testing/test_reducer_home/.local/share/taler/exchange-offline/master.priv
@@ -1 +1 @@
-�MW��r)�f(+���ME����]�k�����
\ No newline at end of file
+4��[�3���1@��"�7MA��l������$
\ No newline at end of file

-- 
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.