summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authortg(x) <*@tg-x.net>2016-11-04 20:38:50 +0100
committertg(x) <*@tg-x.net>2016-11-04 20:38:50 +0100
commit2a44112a25e7718595a7a9bb7c6df2e616868400 (patch)
tree75dcb50be63b552602b3f4a0d7063649fe7cb7cd /src
parent702c440849f84f7dd7d73a16758ff975251af7da (diff)
parent95a6d399f897411a5c19290551085ce5945930c7 (diff)
downloadexchange-2a44112a25e7718595a7a9bb7c6df2e616868400.tar.gz
exchange-2a44112a25e7718595a7a9bb7c6df2e616868400.tar.bz2
exchange-2a44112a25e7718595a7a9bb7c6df2e616868400.zip
Merge branch 'master' of taler.net:exchange
Diffstat (limited to 'src')
-rw-r--r--src/bank-lib/test_bank_api.c10
-rw-r--r--src/exchange-lib/test_exchange_api.c7
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
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");