From 1fe606a63bfde38a5495ac0cf80511994471f548 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 4 Nov 2016 17:45:34 +0100 Subject: half baking #4756 --- src/bank-lib/test_bank_api.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) (limited to 'src/bank-lib/test_bank_api.c') diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c index 88fe8245..bc5e225e 100644 --- a/src/bank-lib/test_bank_api.c +++ b/src/bank-lib/test_bank_api.c @@ -67,22 +67,35 @@ main (int argc, char * const *argv) { struct GNUNET_OS_Process *bankd; + struct GNUNET_OS_Process *bankd_admin; unsigned int cnt; int result; GNUNET_log_setup ("test-bank-api", "WARNING", NULL); + bankd_admin = GNUNET_OS_start_process (GNUNET_NO, + GNUNET_OS_INHERIT_STD_ALL, + NULL, NULL, NULL, + "taler-bank-manage", + "taler-bank-manage", + "--admin", + "serve-http", + "--port", "8081", + NULL); bankd = GNUNET_OS_start_process (GNUNET_NO, GNUNET_OS_INHERIT_STD_ALL, NULL, NULL, NULL, "taler-bank-manage", "taler-bank-manage", "serve-http", - "--port", "8081", + "--port", "8080", NULL); - if (NULL == bankd) + + + if ((NULL == bankd_admin) || (NULL == bankd)) { + /*FIXME: More accurate error message?*/ fprintf (stderr, "taler-bank-manage not found, skipping test\n"); return 77; /* report 'skip' */ @@ -99,13 +112,16 @@ main (int argc, if (cnt > 30) break; } - while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/ -o /dev/null -O /dev/null")); + while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8080/ -o /dev/null -O /dev/null")); + fprintf (stderr, "\n"); result = GNUNET_SYSERR; if (cnt <= 30) GNUNET_SCHEDULER_run (&run, &result); GNUNET_OS_process_kill (bankd, SIGTERM); + GNUNET_OS_process_kill (bankd_admin, + SIGTERM); GNUNET_OS_process_wait (bankd); GNUNET_OS_process_destroy (bankd); if (cnt > 30) -- cgit v1.2.3 From 95a6d399f897411a5c19290551085ce5945930c7 Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 4 Nov 2016 20:04:31 +0100 Subject: wget-ing /admin/add/incoming from bank-lib testcase --- src/bank-lib/test_bank_api.c | 10 ++++++++++ src/exchange-lib/test_exchange_api.c | 7 +++++-- 2 files changed, 15 insertions(+), 2 deletions(-) (limited to 'src/bank-lib/test_bank_api.c') diff --git a/src/bank-lib/test_bank_api.c b/src/bank-lib/test_bank_api.c index bc5e225e..88ca2fd2 100644 --- a/src/bank-lib/test_bank_api.c +++ b/src/bank-lib/test_bank_api.c @@ -114,6 +114,16 @@ main (int argc, } while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8080/ -o /dev/null -O /dev/null")); + do + { + fprintf (stderr, "."); + sleep (1); + cnt++; + if (cnt > 30) + break; + } + while (0 != system ("wget -q -t 1 -T 1 http://127.0.0.1:8081/admin/add/incoming -o /dev/null -O /dev/null")); + fprintf (stderr, "\n"); result = GNUNET_SYSERR; if (cnt <= 30) diff --git a/src/exchange-lib/test_exchange_api.c b/src/exchange-lib/test_exchange_api.c index 39b8bece..e25fa66c 100644 --- a/src/exchange-lib/test_exchange_api.c +++ b/src/exchange-lib/test_exchange_api.c @@ -3073,8 +3073,11 @@ main (int argc, unsigned long code; GNUNET_log_setup ("test-exchange-api", - "WARNING", - NULL); + "DEBUG", + "/tmp/logs"); + GNUNET_log (GNUNET_ERROR_TYPE_DEBUG, "test log\n"); + return 0; + /* These might get in the way... */ unsetenv ("XDG_DATA_HOME"); unsetenv ("XDG_CONFIG_HOME"); -- cgit v1.2.3