[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-exchange] branch master updated: merge aggregator
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-exchange] branch master updated: merge aggregator |
Date: |
Fri, 24 Mar 2017 13:42:34 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository exchange.
The following commit(s) were added to refs/heads/master by this push:
new 7ebacc6 merge aggregator
7ebacc6 is described below
commit 7ebacc6fbdbcec3123016303cf998c44d485bca7
Author: Christian Grothoff <address@hidden>
AuthorDate: Fri Mar 24 13:41:21 2017 +0100
merge aggregator
---
src/bank-lib/test_bank_api.c | 29 ++++++++++++++++++++++-----
src/exchange-lib/test_exchange_api.c | 18 +++++++++++++++++
src/exchange/test_taler_exchange_aggregator.c | 9 +++++++++
3 files changed, 51 insertions(+), 5 deletions(-)
diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c
index 88ca2fd..28b0b6d 100644
--- a/src/bank-lib/test_bank_api.c
+++ b/src/bank-lib/test_bank_api.c
@@ -1,6 +1,6 @@
/*
This file is part of TALER
- Copyright (C) 2016 GNUnet e.V.
+ Copyright (C) 2016, 2017 GNUnet e.V.
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
@@ -71,6 +71,15 @@ main (int argc,
unsigned int cnt;
int result;
+ if (GNUNET_OK !=
+ GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
+ 8081))
+ {
+ fprintf (stderr,
+ "Required port %u not available, skipping.\n",
+ 8081);
+ return 77;
+ }
GNUNET_log_setup ("test-bank-api",
"WARNING",
NULL);
@@ -83,6 +92,12 @@ main (int argc,
"serve-http",
"--port", "8081",
NULL);
+ if (NULL == bankd_admin)
+ {
+ fprintf (stderr,
+ "Failed to launch `taler-bank-manage' for admin, skipping
test\n");
+ return 77; /* report 'skip' */
+ }
bankd = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
@@ -92,12 +107,14 @@ main (int argc,
"--port", "8080",
NULL);
-
- if ((NULL == bankd_admin) || (NULL == bankd))
+ if (NULL == bankd)
{
- /*FIXME: More accurate error message?*/
fprintf (stderr,
- "taler-bank-manage not found, skipping test\n");
+ "Failed to launch taler-bank-manage, skipping test\n");
+ GNUNET_OS_process_kill (bankd_admin,
+ SIGTERM);
+ GNUNET_OS_process_wait (bankd_admin);
+ GNUNET_OS_process_destroy (bankd_admin);
return 77; /* report 'skip' */
}
/* give child time to start and bind against the socket */
@@ -134,6 +151,8 @@ main (int argc,
SIGTERM);
GNUNET_OS_process_wait (bankd);
GNUNET_OS_process_destroy (bankd);
+ GNUNET_OS_process_wait (bankd_admin);
+ GNUNET_OS_process_destroy (bankd_admin);
if (cnt > 30)
{
fprintf (stderr,
diff --git a/src/exchange-lib/test_exchange_api.c
b/src/exchange-lib/test_exchange_api.c
index 9a57e46..ce8c517 100644
--- a/src/exchange-lib/test_exchange_api.c
+++ b/src/exchange-lib/test_exchange_api.c
@@ -3187,6 +3187,24 @@ main (int argc,
GNUNET_log_setup ("test-exchange-api",
"INFO",
NULL);
+ if (GNUNET_OK !=
+ GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
+ 8081))
+ {
+ fprintf (stderr,
+ "Required port %u not available, skipping.\n",
+ 8081);
+ return 77;
+ }
+ if (GNUNET_OK !=
+ GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
+ 8082))
+ {
+ fprintf (stderr,
+ "Required port %u not available, skipping.\n",
+ 8082);
+ return 77;
+ }
proc = GNUNET_OS_start_process (GNUNET_NO,
GNUNET_OS_INHERIT_STD_ALL,
NULL, NULL, NULL,
diff --git a/src/exchange/test_taler_exchange_aggregator.c
b/src/exchange/test_taler_exchange_aggregator.c
index 5a3974f..2830a50 100644
--- a/src/exchange/test_taler_exchange_aggregator.c
+++ b/src/exchange/test_taler_exchange_aggregator.c
@@ -1241,6 +1241,15 @@ main (int argc,
}
GNUNET_OS_process_wait (proc);
GNUNET_OS_process_destroy (proc);
+ if (GNUNET_OK !=
+ GNUNET_NETWORK_test_port_free (IPPROTO_TCP,
+ 8082))
+ {
+ fprintf (stderr,
+ "Required port %u not available, skipping.\n",
+ 8082);
+ return 77;
+ }
cfg = GNUNET_CONFIGURATION_create ();
if (GNUNET_OK !=
GNUNET_CONFIGURATION_parse (cfg,
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-exchange] branch master updated: merge aggregator,
gnunet <=