exchange

commit 2a44112a25e7718595a7a9bb7c6df2e616868400
parent 702c440849f84f7dd7d73a16758ff975251af7da
Author: tg(x) <*@tg-x.net>
Date:   Fri,  4 Nov 2016 20:38:50 +0100

Merge branch 'master' of taler.net:exchange

Diffstat:
M
src/bank-lib/test_bank_api.c
 | 
10
++++++++++
M
src/exchange-lib/test_exchange_api.c
 | 
7
+++++--

2 files changed, 15 insertions(+), 2 deletions(-)
diff --git 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
@@ -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");