From d7c4248aa4f07cadc3036550359f410f2e8674ce Mon Sep 17 00:00:00 2001
From: Tim Kimber <tkimber@mobius.org.uk>
Date: Wed, 4 Mar 2020 17:04:02 +0000
Subject: [PATCH] Fix duckdns tests

---
 test/run-test.cmd                     | 9 ++++++---
 test/run-test.sh                      | 8 +++++---
 test/test-config/getssl-duckdns01.cfg | 2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/test/run-test.cmd b/test/run-test.cmd
index afc324a..e951c44 100644
--- a/test/run-test.cmd
+++ b/test/run-test.cmd
@@ -9,6 +9,7 @@ set COMMAND=%2 %3
 :CheckAlias
 IF %OS%==duckdns GOTO duckdns
 set ALIAS=%OS%.getssl.test
+set STAGING=
 GOTO Run
 
 :NoOS
@@ -21,17 +22,19 @@ set COMMAND=bats /getssl/test
 GOTO CheckAlias
 
 :duckdns
-set ALIAS=%OS%.duckdns.org
+set ALIAS=getssl.duckdns.org
+set STAGING=--env STAGING=true
 
 :Run
+for %%I in (.) do set CurrDirName=%%~nxI
 
 docker build --rm -f "test\Dockerfile-%OS%" -t getssl-%OS% .
 @echo on
 docker run -it ^
-  --env GETSSL_HOST=%OS%.getssl.test ^
+  --env GETSSL_HOST=%ALIAS% %STAGING% ^
   -v %cd%:/getssl ^
   --rm ^
-  --network getssl-timkimber_acmenet ^
+  --network %CurrDirName%_acmenet ^
   --network-alias %ALIAS% ^
   --network-alias a.%OS%.getssl.test ^
   --network-alias b.%OS%.getssl.test ^
diff --git a/test/run-test.sh b/test/run-test.sh
index 76aae16..d85730f 100755
--- a/test/run-test.sh
+++ b/test/run-test.sh
@@ -15,18 +15,20 @@ else
 fi
 
 if [ "$OS" == "duckdns" ]; then
-    ALIAS="$OS.duckdns.org"
+    ALIAS="getssl.duckdns.org"
+    STAGING="--env STAGING=true"
 else
     ALIAS="$OS.getssl.test"
+    STAGING=""
 fi
 
 docker build --rm -f "test/Dockerfile-$OS" -t "getssl-$OS" .
 # shellcheck disable=SC2086
 docker run \
-  --env GETSSL_HOST="$OS.getssl.test" \
+  --env GETSSL_HOST="$OS.getssl.test" $STAGING \
   -v "$(pwd)":/getssl \
   --rm \
-  --network getssl_acmenet\
+  --network ${PWD##*/}_acmenet \
   --network-alias $ALIAS \
   --network-alias "a.$OS.getssl.test" \
   --network-alias "b.$OS.getssl.test" \
diff --git a/test/test-config/getssl-duckdns01.cfg b/test/test-config/getssl-duckdns01.cfg
index 10ac366..517aaeb 100644
--- a/test/test-config/getssl-duckdns01.cfg
+++ b/test/test-config/getssl-duckdns01.cfg
@@ -7,7 +7,7 @@ DNS_ADD_COMMAND="/getssl/dns_scripts/dns_add_duckdns"
 DNS_DEL_COMMAND="/getssl/dns_scripts/dns_del_duckdns"
 AUTH_DNS_SERVER=1.1.1.1
 CHECK_ALL_AUTH_DNS=false
-DNS_EXTRA_WAIT=30
+DNS_EXTRA_WAIT=60
 
 ACCOUNT_KEY_TYPE="rsa"
 PRIVATE_KEY_ALG="rsa"