[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 04/06: fixed some dependencies in testing
|
From: |
gnunet |
|
Subject: |
[taler-anastasis] 04/06: fixed some dependencies in testing |
|
Date: |
Wed, 19 Aug 2020 12:32:25 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis.
commit b96fa45660d9f1ac64e160357e924dc84a6d1116
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Mon Aug 17 17:40:06 2020 +0000
fixed some dependencies in testing
---
src/lib/test_anastasis.c | 33 ++++++++++++++++++++-------------
src/lib/test_anastasis_api.c | 32 +++++++++++++++++++-------------
src/lib/testing_api_helpers.c | 6 ++----
3 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/src/lib/test_anastasis.c b/src/lib/test_anastasis.c
index c2f4b8e..ccbd12e 100644
--- a/src/lib/test_anastasis.c
+++ b/src/lib/test_anastasis.c
@@ -151,6 +151,13 @@ run (void *cls,
struct TALER_TESTING_Interpreter *is)
{
struct TALER_TESTING_Command pay[] = {
+ TALER_TESTING_cmd_merchant_post_instances ("instance-create-default",
+ merchant_url,
+ "default",
+ merchant_payto,
+ "EUR",
+ MHD_HTTP_NO_CONTENT),
+
/**
* Move money to the exchange's bank account.
*/
@@ -255,20 +262,20 @@ run (void *cls,
NULL),
/* what would we have to pay? */
- TALER_TESTING_cmd_proposal_lookup ("fetch-proposal",
- merchant_url,
- MHD_HTTP_OK,
- "secret-share-1",
- NULL),
+ TALER_TESTING_cmd_merchant_claim_order ("fetch-proposal",
+ merchant_url,
+ MHD_HTTP_OK,
+ "secret-share-1",
+ NULL),
/* make the payment */
- TALER_TESTING_cmd_pay ("pay-account",
- merchant_url,
- MHD_HTTP_OK,
- "fetch-proposal",
- "withdraw-coin-1",
- "EUR:5",
- "EUR:4.99", /* must match ANNUAL_FEE in config! */
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-account",
+ merchant_url,
+ MHD_HTTP_OK,
+ "fetch-proposal",
+ "withdraw-coin-1",
+ "EUR:5",
+ "EUR:4.99", /* must match ANNUAL_FEE
in config! */
+ NULL),
ANASTASIS_TESTING_cmd_secret_share ("secret-share-2",
anastasis_url,
diff --git a/src/lib/test_anastasis_api.c b/src/lib/test_anastasis_api.c
index fb8ec66..e2e526a 100644
--- a/src/lib/test_anastasis_api.c
+++ b/src/lib/test_anastasis_api.c
@@ -152,6 +152,12 @@ run (void *cls,
struct TALER_TESTING_Interpreter *is)
{
struct TALER_TESTING_Command pay[] = {
+ TALER_TESTING_cmd_merchant_post_instances ("instance-create-default",
+ merchant_url,
+ "default",
+ merchant_payto,
+ "EUR",
+ MHD_HTTP_NO_CONTENT),
/**
* Move money to the exchange's bank account.
*/
@@ -208,20 +214,20 @@ run (void *cls,
strlen ("Test-1")),
/* what would we have to pay? */
- TALER_TESTING_cmd_proposal_lookup ("fetch-proposal",
- merchant_url,
- MHD_HTTP_OK,
- "policy-store-1",
- NULL),
+ TALER_TESTING_cmd_merchant_claim_order ("fetch-proposal",
+ merchant_url,
+ MHD_HTTP_OK,
+ "policy-store-1",
+ NULL),
/* make the payment */
- TALER_TESTING_cmd_pay ("pay-account",
- merchant_url,
- MHD_HTTP_OK,
- "fetch-proposal",
- "withdraw-coin-1",
- "EUR:5",
- "EUR:4.99", /* must match ANNUAL_FEE in config! */
- "EUR:0.01"),
+ TALER_TESTING_cmd_merchant_pay_order ("pay-account",
+ merchant_url,
+ MHD_HTTP_OK,
+ "fetch-proposal",
+ "withdraw-coin-1",
+ "EUR:5",
+ "EUR:4.99", /* must match ANNUAL_FEE
in config! */
+ NULL),
ANASTASIS_TESTING_cmd_policy_store ("policy-store-2",
anastasis_url,
diff --git a/src/lib/testing_api_helpers.c b/src/lib/testing_api_helpers.c
index 8d5895f..e86cb86 100644
--- a/src/lib/testing_api_helpers.c
+++ b/src/lib/testing_api_helpers.c
@@ -49,8 +49,7 @@ ANASTASIS_TESTING_run_anastasis (const char *config_filename,
char *wget_cmd;
anastasis_proc
- = GNUNET_OS_start_process (GNUNET_NO,
- GNUNET_OS_INHERIT_STD_ALL,
+ = GNUNET_OS_start_process (GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
"anastasis-httpd",
"anastasis-httpd",
@@ -146,8 +145,7 @@ ANASTASIS_TESTING_prepare_anastasis (const char
*config_filename)
/* DB preparation */
if (NULL == (dbinit_proc = GNUNET_OS_start_process
- (GNUNET_NO,
- GNUNET_OS_INHERIT_STD_ALL,
+ (GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
"anastasis-dbinit",
"anastasis-dbinit",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-anastasis] branch master updated (a735150 -> 8b5083a), gnunet, 2020/08/19
- [taler-anastasis] 01/06: worked on dependency-fix, gnunet, 2020/08/19
- [taler-anastasis] 02/06: fixed Anastasis to build, testing fails, gnunet, 2020/08/19
- [taler-anastasis] 03/06: fixed error with GNUNET_CRYPTO_pow_hash, gnunet, 2020/08/19
- [taler-anastasis] 06/06: fix api test, gnunet, 2020/08/19
- [taler-anastasis] 05/06: fixed salt issue with GNUNET_CRYPTO_pow_hash, gnunet, 2020/08/19
- [taler-anastasis] 04/06: fixed some dependencies in testing,
gnunet <=