[taler-merchant] branch master updated: add test for #6912

[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 fee2c864 add test for #6912
fee2c864 is described below

commit fee2c8647b7fe864fc33cd21af4cce622cc8697d
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Tue Aug 31 13:00:28 2021 +0200

    add test for #6912
---
 contrib/merchant-backoffice                          |  2 +-
 .../taler-merchant-httpd_private-post-transfers.c    |  4 ++--
 src/testing/initialize_taler_system.sh               | 20 ++++++++++++++++++--
 src/testing/test-merchant-walletharness.sh           | 18 +++++++++++++++++-
 src/testing/test_key_rotation.sh                     | 18 +++++++++++++++++-
 src/testing/test_merchant_instance_purge.sh          | 18 +++++++++++++++++-
 src/testing/test_merchant_instance_response.sh       | 18 +++++++++++++++++-
 src/testing/test_merchant_product_creation.sh        | 18 +++++++++++++++++-
 src/testing/test_merchant_reserve_creation.sh        | 18 +++++++++++++++++-
 9 files changed, 123 insertions(+), 11 deletions(-)

diff --git a/contrib/merchant-backoffice b/contrib/merchant-backoffice
index ad094c2c..824aa7a8 160000
--- a/contrib/merchant-backoffice
+++ b/contrib/merchant-backoffice
@@ -1 +1 @@
-Subproject commit ad094c2c75caa4e29ae998dba8fe1676b42d7bce
+Subproject commit 824aa7a80b4c2e63d23985751f34c9492d396a36
diff --git a/src/backend/taler-merchant-httpd_private-post-transfers.c 
b/src/backend/taler-merchant-httpd_private-post-transfers.c
index 5ae7ac49..18ff781d 100644
--- a/src/backend/taler-merchant-httpd_private-post-transfers.c
+++ b/src/backend/taler-merchant-httpd_private-post-transfers.c
@@ -135,7 +135,7 @@ struct PostTransfersContext
    * #GNUNET_SYSERR if we found a matching coin, but the amounts do not match.
    * #GNUNET_OK if we did find a matching coin.
    */
-  int check_transfer_result;
+  enum GNUNET_GenericReturnValue check_transfer_result;
 
   /**
    * Should we retry the transaction due to a serialization error?
@@ -370,7 +370,7 @@ check_transfer (void *cls,
  * @return #GNUNET_SYSERR if we returned hard proof of
  *   missbehavior from the exchange to the client
  */
-static int
+static enum GNUNET_GenericReturnValue
 check_wire_fee (struct PostTransfersContext *ptc,
                 struct GNUNET_TIME_Absolute execution_time,
                 const struct TALER_Amount *wire_fee)
diff --git a/src/testing/initialize_taler_system.sh 
b/src/testing/initialize_taler_system.sh
index abe8a6d2..218de4bf 100755
--- a/src/testing/initialize_taler_system.sh
+++ b/src/testing/initialize_taler_system.sh
@@ -1,4 +1,20 @@
-# This file is in the public domain.
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 ## Coloring style Text shell script
 COLOR='\033[0;35m'
 NOCOLOR='\033[0m'
@@ -57,7 +73,7 @@ echo -n "Testing for taler-bank-manage"
 taler-bank-manage --help >/dev/null </dev/null || exit_skip " MISSING"
 echo " FOUND"
 echo -n "Testing for taler-wallet-cli"
-taler-wallet-cli -v >/dev/null </dev/null || exit_skip " MISSING"
+taler-wallet-cli -v >/dev/null </dev/null 2> /dev/null || exit_skip " MISSING"
 echo " FOUND"
 
 echo -n "Generating Taler auditor, exchange and merchant configurations ..."
diff --git a/src/testing/test-merchant-walletharness.sh 
b/src/testing/test-merchant-walletharness.sh
index f3f1d59a..98a78efa 100755
--- a/src/testing/test-merchant-walletharness.sh
+++ b/src/testing/test-merchant-walletharness.sh
@@ -1,5 +1,21 @@
 #!/usr/bin/env bash
-
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 # This script runs test from the wallet's integration test harness.
 # If the wallet is not installed, the tests are skipped.
 # Only tests from the "merchant" test suite are run.
diff --git a/src/testing/test_key_rotation.sh b/src/testing/test_key_rotation.sh
index 9e8e7eb0..8aabe91d 100755
--- a/src/testing/test_key_rotation.sh
+++ b/src/testing/test_key_rotation.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
-# This file is in the public domain.
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 #
 # Note that this test is intentionally NOT run as part of the standard test
 # suite, because it is awfully slow (due to necessary 'wait' operations) and
diff --git a/src/testing/test_merchant_instance_purge.sh 
b/src/testing/test_merchant_instance_purge.sh
index dfb867d5..e064457e 100755
--- a/src/testing/test_merchant_instance_purge.sh
+++ b/src/testing/test_merchant_instance_purge.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
-# This file is in the public domain.
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 
 . initialize_taler_system.sh
 
diff --git a/src/testing/test_merchant_instance_response.sh 
b/src/testing/test_merchant_instance_response.sh
index d3863642..54d2559e 100755
--- a/src/testing/test_merchant_instance_response.sh
+++ b/src/testing/test_merchant_instance_response.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
-# This file is in the public domain.
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 
 . initialize_taler_system.sh
 
diff --git a/src/testing/test_merchant_product_creation.sh 
b/src/testing/test_merchant_product_creation.sh
index b36d9fad..938a13d3 100755
--- a/src/testing/test_merchant_product_creation.sh
+++ b/src/testing/test_merchant_product_creation.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
-# This file is in the public domain.
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 
 . initialize_taler_system.sh
 
diff --git a/src/testing/test_merchant_reserve_creation.sh 
b/src/testing/test_merchant_reserve_creation.sh
index 96734478..8f34a038 100755
--- a/src/testing/test_merchant_reserve_creation.sh
+++ b/src/testing/test_merchant_reserve_creation.sh
@@ -1,5 +1,21 @@
 #!/bin/bash
-# This file is in the public domain.
+# This file is part of TALER
+# Copyright (C) 2014-2021 Taler Systems SA
+#
+# TALER is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 3, or
+# (at your option) any later version.
+#
+# TALER is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public
+# License along with TALER; see the file COPYING.  If not, see
+# <http://www.gnu.org/licenses/>
+#
 
 . initialize_taler_system.sh
 

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