[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis] 02/02: fix tests: ensure localhost providers are avail
From: |
gnunet |
Subject: |
[taler-anastasis] 02/02: fix tests: ensure localhost providers are available while running tests |
Date: |
Wed, 11 Jan 2023 13:31:38 +0100 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis.
commit da9920cff32d03cbc597518107f186f9e99bea82
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Wed Jan 11 13:31:24 2023 +0100
fix tests: ensure localhost providers are available while running tests
---
contrib/provider-list.json | 20 ++++++++++++++++++++
contrib/redux.countries.json | 6 ++++++
src/cli/test_anastasis_reducer_recovery_no_pay.sh | 10 +++++-----
src/reducer/anastasis_api_redux.c | 3 +++
4 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/contrib/provider-list.json b/contrib/provider-list.json
index 47e67eb..ddce9be 100644
--- a/contrib/provider-list.json
+++ b/contrib/provider-list.json
@@ -13,6 +13,26 @@
{
"url" : "https://v1.anastasis.lu/",
"name" : "Anastasis SARL, Luxembourg"
+ },
+ {
+ "url" : "http://localhost:8086/",
+ "name" : "Data Loss Inc. #1",
+ "restricted" : "xx"
+ },
+ {
+ "url" : "http://localhost:8087/",
+ "name" : "Data Loss Inc. #2",
+ "restricted" : "xx"
+ },
+ {
+ "url" : "http://localhost:8088/",
+ "name" : "Data Loss Inc. #3",
+ "restricted" : "xx"
+ },
+ {
+ "url" : "http://localhost:8089/",
+ "name" : "Data Loss Inc. #4",
+ "restricted" : "xx"
}
]
}
diff --git a/contrib/redux.countries.json b/contrib/redux.countries.json
index 03eaeb5..113cb01 100644
--- a/contrib/redux.countries.json
+++ b/contrib/redux.countries.json
@@ -85,6 +85,12 @@
"name" : "United States of America (USA)",
"continent" : "North America",
"call_code" : "+1"
+ },
+ {
+ "code" : "xx",
+ "name" : "Testland",
+ "continent" : "Demoworld",
+ "call_code" : "+0"
}
]
}
diff --git a/src/cli/test_anastasis_reducer_recovery_no_pay.sh
b/src/cli/test_anastasis_reducer_recovery_no_pay.sh
index 12ac7e9..f6b1401 100755
--- a/src/cli/test_anastasis_reducer_recovery_no_pay.sh
+++ b/src/cli/test_anastasis_reducer_recovery_no_pay.sh
@@ -121,10 +121,10 @@ echo " OK"
echo -n "Launching anastasis services ..."
PREFIX="" #valgrind
-$PREFIX anastasis-httpd -c $CONF_1 2> anastasis-httpd_1.log &
-$PREFIX anastasis-httpd -c $CONF_2 2> anastasis-httpd_2.log &
-$PREFIX anastasis-httpd -c $CONF_3 2> anastasis-httpd_3.log &
-$PREFIX anastasis-httpd -c $CONF_4 2> anastasis-httpd_4.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_1 2> anastasis-httpd_1.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_2 2> anastasis-httpd_2.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_3 2> anastasis-httpd_3.log &
+$PREFIX anastasis-httpd -L DEBUG -c $CONF_4 2> anastasis-httpd_4.log &
echo -n "Waiting for anastasis services ..."
@@ -180,7 +180,7 @@ anastasis-reducer -a \
"instructions": "What is your name?",
"challenge": "91GPWWR"
} }' \
- add_authentication < $B2FILE > $B1FILE
+ add_authentication < $B2FILE > $B1FILE
echo -n "."
# "64S36" encodes "123"
anastasis-reducer -a \
diff --git a/src/reducer/anastasis_api_redux.c
b/src/reducer/anastasis_api_redux.c
index 0535883..31a389b 100644
--- a/src/reducer/anastasis_api_redux.c
+++ b/src/reducer/anastasis_api_redux.c
@@ -879,6 +879,9 @@ begin_provider_config_check (const char *cc,
cc)) )
{
/* skip */
+ GNUNET_log (GNUNET_ERROR_TYPE_WARNING,
+ "Skipping provider restricted to country `%s'\n",
+ restricted);
continue;
}
if ( (NULL == restricted) &&
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.