[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-merchant] 05/08: get tests to pass (again)
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] [taler-merchant] 05/08: get tests to pass (again) |
|
Date: |
Sun, 15 Apr 2018 12:26:22 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository merchant.
commit 9873cea13a8446aafed6fb43f19bc15817452073
Author: Christian Grothoff <address@hidden>
AuthorDate: Mon Apr 2 17:27:39 2018 +0200
get tests to pass (again)
---
src/backend/taler-merchant-httpd.c | 11 ++++----
src/lib/Makefile.am | 3 +-
src/lib/test_merchant_api.c | 55 +++++++++++++++++++++----------------
src/lib/test_merchant_api_new.c | 4 +--
src/lib/test_merchant_api_twisted.c | 14 ++++++++--
5 files changed, 51 insertions(+), 36 deletions(-)
diff --git a/src/backend/taler-merchant-httpd.c
b/src/backend/taler-merchant-httpd.c
index 7119af5..213e115 100644
--- a/src/backend/taler-merchant-httpd.c
+++ b/src/backend/taler-merchant-httpd.c
@@ -1332,13 +1332,12 @@ run (void *cls,
if (GNUNET_OK !=
GNUNET_CONFIGURATION_get_value_string (config,
"merchant",
- "unixpath_mode",
+ "UNIXPATH_MODE",
&mode))
{
- GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
+ GNUNET_log_config_missing (GNUNET_ERROR_TYPE_ERROR,
"merchant",
- "unixpath_mode",
- "unixpath_mode required");
+ "UNIXPATH_MODE");
GNUNET_SCHEDULER_shutdown ();
return;
}
@@ -1348,8 +1347,8 @@ run (void *cls,
{
GNUNET_log_config_invalid (GNUNET_ERROR_TYPE_ERROR,
"merchant",
- "unixpath_mode",
- "unixpath_mode must be octal number");
+ "UNIXPATH_MODE",
+ "must be octal number");
GNUNET_free (mode);
GNUNET_SCHEDULER_shutdown ();
return;
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1189abe..39acd3a 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -80,7 +80,8 @@ check_PROGRAMS = \
if HAVE_EXPERIMENTAL
if HAVE_TWISTER
- check_PROGRAMS += test_merchant_api_twisted
+# See FIXME_MARCELLO -- had some issues (FTBFS, etc.)
+# check_PROGRAMS += test_merchant_api_twisted
endif
endif
diff --git a/src/lib/test_merchant_api.c b/src/lib/test_merchant_api.c
index e255666..cb2b884 100644
--- a/src/lib/test_merchant_api.c
+++ b/src/lib/test_merchant_api.c
@@ -48,14 +48,29 @@
#define EXCHANGE_ACCOUNT_NO 2
/**
+ * Account number of the merchant at the bank.
+ */
+#define MERCHANT_ACCOUNT_NO 3
+
+/**
+ * Customer account number.
+ */
+#define TIP_ACCOUNT_NO 62
+
+/**
+ * Customer account number.
+ */
+#define USER_ACCOUNT_NO 63
+
+/**
* URL of the bank.
*/
-#define BANK_URL "http://localhost:8083/";
+#define BANK_URL "http://localhost:8082/";
/**
* On which port do we run the (fake) bank?
*/
-#define BANK_PORT 8083
+#define BANK_PORT 8082
/**
* Max size allowed for an order.
@@ -4395,10 +4410,8 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-498c",
.details.check_bank_transfer.amount = "EUR:4.98",
- /* exchange-outgoing */
- .details.check_bank_transfer.account_debit = 2,
- /* merchant */
- .details.check_bank_transfer.account_credit = 62
+ .details.check_bank_transfer.account_debit = EXCHANGE_ACCOUNT_NO,
+ .details.check_bank_transfer.account_credit = MERCHANT_ACCOUNT_NO
},
/* Check that there are no other unusual transfers */
@@ -4448,10 +4461,8 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-498c-2",
.details.check_bank_transfer.amount = "EUR:4.98",
- /* exchange-outgoing */
- .details.check_bank_transfer.account_debit = 2,
- /* merchant */
- .details.check_bank_transfer.account_credit = 62
+ .details.check_bank_transfer.account_debit = EXCHANGE_ACCOUNT_NO,
+ .details.check_bank_transfer.account_credit = MERCHANT_ACCOUNT_NO
},
/* Check that there are no other unusual transfers */
@@ -4528,7 +4539,7 @@ run (void *cls)
.label = "create-reserve-tip-1",
.expected_response_code = MHD_HTTP_OK,
.details.admin_add_incoming.instance = "tip",
- .details.admin_add_incoming.debit_account_no = 62,
+ .details.admin_add_incoming.debit_account_no = TIP_ACCOUNT_NO,
.details.admin_add_incoming.credit_account_no = EXCHANGE_ACCOUNT_NO,
.details.admin_add_incoming.auth_username = "user62",
.details.admin_add_incoming.auth_password = "pass62",
@@ -4543,7 +4554,7 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-tip-1",
.details.check_bank_transfer.amount = "EUR:20.04",
- .details.check_bank_transfer.account_debit = 62,
+ .details.check_bank_transfer.account_debit = TIP_ACCOUNT_NO,
.details.check_bank_transfer.account_credit = EXCHANGE_ACCOUNT_NO
},
/* Authorize two tips */
@@ -4666,10 +4677,8 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-tip-498c",
.details.check_bank_transfer.amount = "EUR:4.98",
- /* exchange-outgoing */
- .details.check_bank_transfer.account_debit = 2,
- /* merchant */
- .details.check_bank_transfer.account_credit = 62
+ .details.check_bank_transfer.account_debit = EXCHANGE_ACCOUNT_NO,
+ .details.check_bank_transfer.account_credit = MERCHANT_ACCOUNT_NO
},
/* Check that there are no other unusual transfers */
@@ -4684,7 +4693,7 @@ run (void *cls)
{ .oc = OC_ADMIN_ADD_INCOMING,
.label = "create-reserve-10",
.expected_response_code = MHD_HTTP_OK,
- .details.admin_add_incoming.debit_account_no = 62,
+ .details.admin_add_incoming.debit_account_no = USER_ACCOUNT_NO,
.details.admin_add_incoming.credit_account_no = EXCHANGE_ACCOUNT_NO,
.details.admin_add_incoming.auth_username = "user62",
.details.admin_add_incoming.auth_password = "pass62",
@@ -4695,7 +4704,7 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-10",
.details.check_bank_transfer.amount = "EUR:10.02",
- .details.check_bank_transfer.account_debit = 62,
+ .details.check_bank_transfer.account_debit = USER_ACCOUNT_NO,
.details.check_bank_transfer.account_credit = EXCHANGE_ACCOUNT_NO
},
@@ -4773,10 +4782,8 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-9.97-10",
.details.check_bank_transfer.amount = "EUR:9.97",
- /* exchange-outgoing */
- .details.check_bank_transfer.account_debit = 2,
- /* merchant */
- .details.check_bank_transfer.account_credit = 62
+ .details.check_bank_transfer.account_debit = EXCHANGE_ACCOUNT_NO,
+ .details.check_bank_transfer.account_credit = MERCHANT_ACCOUNT_NO
},
/* Check that there are no other unusual transfers */
@@ -4791,7 +4798,7 @@ run (void *cls)
{ .oc = OC_ADMIN_ADD_INCOMING,
.label = "create-reserve-11",
.expected_response_code = MHD_HTTP_OK,
- .details.admin_add_incoming.debit_account_no = 62,
+ .details.admin_add_incoming.debit_account_no = USER_ACCOUNT_NO,
.details.admin_add_incoming.credit_account_no = EXCHANGE_ACCOUNT_NO,
.details.admin_add_incoming.auth_username = "user62",
.details.admin_add_incoming.auth_password = "pass62",
@@ -4802,7 +4809,7 @@ run (void *cls)
{ .oc = OC_CHECK_BANK_TRANSFER,
.label = "check_bank_transfer-11",
.details.check_bank_transfer.amount = "EUR:10.02",
- .details.check_bank_transfer.account_debit = 62,
+ .details.check_bank_transfer.account_debit = USER_ACCOUNT_NO,
.details.check_bank_transfer.account_credit = EXCHANGE_ACCOUNT_NO
},
diff --git a/src/lib/test_merchant_api_new.c b/src/lib/test_merchant_api_new.c
index 3021ba9..0559a63 100644
--- a/src/lib/test_merchant_api_new.c
+++ b/src/lib/test_merchant_api_new.c
@@ -638,7 +638,7 @@ run (void *cls,
EXCHANGE_URL,
"EUR:4.98",
EXCHANGE_ACCOUNT_NO,
- USER_ACCOUNT_NO),
+ MERCHANT_ACCOUNT_NO),
TALER_TESTING_cmd_check_bank_empty
("check_bank_empty-at-tips"),
@@ -725,7 +725,7 @@ run (void *cls,
EXCHANGE_URL,
"EUR:9.97",
EXCHANGE_ACCOUNT_NO,
- USER_ACCOUNT_NO),
+ MERCHANT_ACCOUNT_NO),
TALER_TESTING_cmd_check_bank_empty ("check_bank_empty-10"),
diff --git a/src/lib/test_merchant_api_twisted.c
b/src/lib/test_merchant_api_twisted.c
index 3fc5b80..e17a4d2 100644
--- a/src/lib/test_merchant_api_twisted.c
+++ b/src/lib/test_merchant_api_twisted.c
@@ -18,7 +18,7 @@
*/
/**
- * @file exchange/test_merchant_api_new.c
+ * @file exchange/test_merchant_api_twisted.c
* @brief testcase to test exchange's HTTP API interface
* @author Sree Harsha Totakura <address@hidden>
* @author Christian Grothoff
@@ -111,6 +111,11 @@ static struct GNUNET_OS_Process *twistermerchantd;
#define EXCHANGE_ACCOUNT_NO 2
/**
+ * Account number of the merchant at the bank.
+ */
+#define MERCHANT_ACCOUNT_NO 3
+
+/**
* Account number of some user.
*/
#define USER_ACCOUNT_NO 62
@@ -552,7 +557,9 @@ run (void *cls,
deposit fee 0.01 * 2 -
wire fee 0.01
*/
- "EUR:1.97", 2, 62),
+ "EUR:1.97",
+ EXCHANGE_ACCOUNT_NO,
+ MERCHANT_ACCOUNT_NO),
/* Should instead change the response body somehow! */
TALER_TESTING_cmd_modify_object ("hack-0",
@@ -804,6 +811,7 @@ purge_process (struct GNUNET_OS_Process *process)
GNUNET_OS_process_destroy (process);
}
+
int
main (int argc,
char * const *argv)
@@ -879,4 +887,4 @@ main (int argc,
return 0;
}
-/* end of test_merchant_api_new.c */
+/* end of test_merchant_api_twisted.c */
--
To stop receiving notification emails like this one, please contact
address@hidden
- [GNUnet-SVN] [taler-merchant] branch master updated (d880b37 -> c2e039b), gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 07/08: update manual, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 08/08: fix possible test errors in configure.ac, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 04/08: fix misc issues with tests after latest refactoring, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 01/08: pre-merge changes towards #4939 patch, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 05/08: get tests to pass (again),
gnunet <=
- [GNUnet-SVN] [taler-merchant] 06/08: update manual to reflect current options, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 03/08: fix more of config files, fix testing_api_helpers logic to deal with merchant ports that are not 8082, gnunet, 2018/04/15
- [GNUnet-SVN] [taler-merchant] 02/08: Towards enabling multiple wire accounts per merchant., gnunet, 2018/04/15