From 61fe4647ad2379b2eef6befc1fb4172253e2144c Mon Sep 17 00:00:00 2001
From: Tim Kimber <tkimber@mobius.org.uk>
Date: Sun, 26 Apr 2020 20:21:45 +0100
Subject: [PATCH] Add tests for #553

---
 test/1-simple-http01-dig.bats      | 40 ++++++++++++++++++++++++++++++
 test/1-simple-http01-nslookup.bats | 40 ++++++++++++++++++++++++++++++
 test/1-simple-http01.bats          |  4 +--
 test/2-simple-dns01-dig.bats       | 17 ++++++++++++-
 test/2-simple-dns01-nslookup.bats  |  6 +++++
 5 files changed, 104 insertions(+), 3 deletions(-)
 create mode 100644 test/1-simple-http01-dig.bats
 create mode 100644 test/1-simple-http01-nslookup.bats

diff --git a/test/1-simple-http01-dig.bats b/test/1-simple-http01-dig.bats
new file mode 100644
index 0000000..be01f27
--- /dev/null
+++ b/test/1-simple-http01-dig.bats
@@ -0,0 +1,40 @@
+#! /usr/bin/env bats
+
+load '/bats-support/load.bash'
+load '/bats-assert/load.bash'
+load '/getssl/test/test_helper.bash'
+
+
+# This is run for every test
+setup() {
+    export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
+    if [ -f /usr/bin/host ]; then
+        mv /usr/bin/host /usr/bin/host.getssl.bak
+    fi
+    if [ -f /usr/bin/nslookup ]; then
+        mv /usr/bin/nslookup /usr/bin/nslookup.getssl.bak
+    fi
+}
+
+
+teardown() {
+    if [ -f /usr/bin/host.getssl.bak ]; then
+        mv /usr/bin/host.getssl.bak /usr/bin/host
+    fi
+    if [ -f /usr/bin/nslookup.getssl.bak ]; then
+        mv /usr/bin/nslookup.getssl.bak /usr/bin/nslookup
+    fi
+}
+
+
+@test "Create new certificate using HTTP-01 verification (dig)" {
+    if [ -n "$STAGING" ]; then
+        skip "Using staging server, skipping internal test"
+    fi
+    CONFIG_FILE="getssl-http01.cfg"
+    setup_environment
+    init_getssl
+    create_certificate
+    assert_success
+    check_output_for_errors
+}
diff --git a/test/1-simple-http01-nslookup.bats b/test/1-simple-http01-nslookup.bats
new file mode 100644
index 0000000..78d175a
--- /dev/null
+++ b/test/1-simple-http01-nslookup.bats
@@ -0,0 +1,40 @@
+#! /usr/bin/env bats
+
+load '/bats-support/load.bash'
+load '/bats-assert/load.bash'
+load '/getssl/test/test_helper.bash'
+
+
+# This is run for every test
+setup() {
+    export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
+    if [ -f /usr/bin/dig ]; then
+        mv /usr/bin/dig /usr/bin/dig.getssl.bak
+    fi
+    if [ -f /usr/bin/host ]; then
+        mv /usr/bin/host /usr/bin/host.getssl.bak
+    fi
+}
+
+
+teardown() {
+    if [ -f /usr/bin/dig.getssl.bak ]; then
+        mv /usr/bin/dig.getssl.bak /usr/bin/dig
+    fi
+    if [ -f /usr/bin/host.getssl.bak ]; then
+        mv /usr/bin/host.getssl.bak /usr/bin/host
+    fi
+}
+
+
+@test "Create new certificate using HTTP-01 verification (nslookup)" {
+    if [ -n "$STAGING" ]; then
+        skip "Using staging server, skipping internal test"
+    fi
+    CONFIG_FILE="getssl-http01.cfg"
+    setup_environment
+    init_getssl
+    create_certificate
+    assert_success
+    check_output_for_errors
+}
diff --git a/test/1-simple-http01.bats b/test/1-simple-http01.bats
index 6b37f86..a57010b 100644
--- a/test/1-simple-http01.bats
+++ b/test/1-simple-http01.bats
@@ -11,7 +11,7 @@ setup() {
 }
 
 
-@test "Create new certificate using HTTP-01 verification" {
+@test "Create new certificate using HTTP-01 verification (any dns tool)" {
     if [ -n "$STAGING" ]; then
         skip "Using staging server, skipping internal test"
     fi
@@ -24,7 +24,7 @@ setup() {
 }
 
 
-@test "Force renewal of certificate using HTTP-01" {
+@test "Force renewal of certificate using HTTP-01 (any dns tool)" {
     if [ -n "$STAGING" ]; then
         skip "Using staging server, skipping internal test"
     fi
diff --git a/test/2-simple-dns01-dig.bats b/test/2-simple-dns01-dig.bats
index 6803f15..0a54684 100644
--- a/test/2-simple-dns01-dig.bats
+++ b/test/2-simple-dns01-dig.bats
@@ -5,9 +5,24 @@ load '/bats-assert/load.bash'
 load '/getssl/test/test_helper.bash'
 
 
-# This is run for every test
 setup() {
     export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
+    if [ -f /usr/bin/host ]; then
+        mv /usr/bin/host /usr/bin/host.getssl.bak
+    fi
+    if [ -f /usr/bin/nslookup ]; then
+        mv /usr/bin/nslookup /usr/bin/nslookup.getssl.bak
+    fi
+}
+
+
+teardown() {
+    if [ -f /usr/bin/host.getssl.bak ]; then
+        mv /usr/bin/host.getssl.bak /usr/bin/host
+    fi
+    if [ -f /usr/bin/nslookup.getssl.bak ]; then
+        mv /usr/bin/nslookup.getssl.bak /usr/bin/nslookup
+    fi
 }
 
 
diff --git a/test/2-simple-dns01-nslookup.bats b/test/2-simple-dns01-nslookup.bats
index 7e675a8..dc6f2f5 100644
--- a/test/2-simple-dns01-nslookup.bats
+++ b/test/2-simple-dns01-nslookup.bats
@@ -11,6 +11,9 @@ setup() {
     if [ -f /usr/bin/dig ]; then
         mv /usr/bin/dig /usr/bin/dig.getssl.bak
     fi
+    if [ -f /usr/bin/host ]; then
+        mv /usr/bin/host /usr/bin/host.getssl.bak
+    fi
 }
 
 
@@ -18,6 +21,9 @@ teardown() {
     if [ -f /usr/bin/dig.getssl.bak ]; then
         mv /usr/bin/dig.getssl.bak /usr/bin/dig
     fi
+    if [ -f /usr/bin/host.getssl.bak ]; then
+        mv /usr/bin/host.getssl.bak /usr/bin/host
+    fi
 }