-fix more tests

3 files changed, 24 insertions, 3 deletions

diff --git a/src/gns/test_gns_lookup.conf b/src/gns/test_gns_lookup.conf
index db0b4bfbe..fe7970018 100644
--- a/src/gns/test_gns_lookup.conf
+++ b/src/gns/test_gns_lookup.conf
@@ -22,6 +22,17 @@ DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
 [namestore]
 #PREFIX = valgrind --leak-check=full --track-origins=yes --log-file=/tmp/ns_log
 
+[zonemaster-monitor]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+
+[zonemaster]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+
+[rest]
+BASIC_AUTH_ENABLED=NO
+
 [revocation]
 WORKBITS = 2
 EPOCH_DURATION = 365 d
diff --git a/src/gns/test_gns_proxy.conf b/src/gns/test_gns_proxy.conf
index 3b21f1d90..c87f26d40 100644
--- a/src/gns/test_gns_proxy.conf
+++ b/src/gns/test_gns_proxy.conf
@@ -13,6 +13,15 @@ RECORD_PUT_INTERVAL = 1 h
 ZONE_PUBLISH_TIME_WINDOW = 1 h
 DNS_ROOT=PD67SGHF3E0447TU9HADIVU9OM7V4QHTOG0EBU69TFRI2LG63DR0
 
+[zonemaster-monitor]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+
+[zonemaster]
+IMMEDIATE_START = YES
+START_ON_DEMAND = YES
+
+
 
 [gns-proxy]
 PROXY_CACERT = /tmp/proxy_cacert.pem
diff --git a/src/gns/test_plugin_rest_gns.sh b/src/gns/test_plugin_rest_gns.sh
index 25c39f135..3bcfb5a08 100755
--- a/src/gns/test_plugin_rest_gns.sh
+++ b/src/gns/test_plugin_rest_gns.sh
@@ -21,10 +21,10 @@ wrong_link="http://localhost:7776/gnsandmore"
 curl_get () {
     #$1 is link
     #$2 is grep
-    XURL=`which gnurl || which curl`
+    XURL=`which curl`
     if [ "" = "$XURL" ]
     then
-        echo "HTTP client (curl/gnurl) not found, exiting"
+        echo "HTTP client (curl) not found, exiting"
         exit 77
     fi
     sleep 0.5
@@ -34,13 +34,14 @@ curl_get () {
     then
         gnunet-identity -D "$TEST_TLD" -c test_gns_lookup.conf > /dev/null 2>&1
         gnunet-arm -e -c test_gns_lookup.conf
-        echo "Download of $1 using $XURL failed"
+        echo "Download of $1 using $XURL failed, expected $2"
         exit 1
     fi
 }
 TEST_TLD="testtld"
 
 gnunet-arm -s -c test_gns_lookup.conf
+
 curl_get "$gns_link/www.$TEST_TLD" "error"
 
 gnunet-identity -C "$TEST_TLD"  -c test_gns_lookup.conf