From d8a0e4ca237545b6515d29beba193c9edf4d07c4 Mon Sep 17 00:00:00 2001
From: Tim Kimber <tkimber@mobius.org.uk>
Date: Tue, 28 Jan 2020 19:47:15 +0100
Subject: [PATCH] Check output for "Error", "Failed" and "Warning"

---
 test/1-simple-http01.bats           | 6 ++++++
 test/2-simple-dns01.bats            | 6 ++++++
 test/4-more-than-10-hosts.bats      | 7 ++++++-
 test/Dockerfile-ubuntu18            | 3 +++
 test/README.md                      | 6 +++---
 test/{run-test.sh => debug-test.sh} | 4 ++--
 test/run-all-tests.sh               | 4 ++++
 7 files changed, 30 insertions(+), 6 deletions(-)
 rename test/{run-test.sh => debug-test.sh} (79%)
 create mode 100644 test/run-all-tests.sh

diff --git a/test/1-simple-http01.bats b/test/1-simple-http01.bats
index 40416b2..4c55304 100644
--- a/test/1-simple-http01.bats
+++ b/test/1-simple-http01.bats
@@ -17,6 +17,9 @@ setup() {
     init_getssl
     create_certificate
     assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
 }
 
 
@@ -24,5 +27,8 @@ setup() {
     #!FIXME test certificate has been updated
     run ${CODE_DIR}/getssl -f $GETSSL_HOST
     assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
     cleanup_environment
 }
diff --git a/test/2-simple-dns01.bats b/test/2-simple-dns01.bats
index e1a37ec..9d9f44b 100644
--- a/test/2-simple-dns01.bats
+++ b/test/2-simple-dns01.bats
@@ -17,6 +17,9 @@ setup() {
     init_getssl
     create_certificate
     assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
 }
 
 
@@ -24,5 +27,8 @@ setup() {
     #!FIXME test certificate has been updated
     run ${CODE_DIR}/getssl -f $GETSSL_HOST
     assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
     cleanup_environment
 }
diff --git a/test/4-more-than-10-hosts.bats b/test/4-more-than-10-hosts.bats
index 0493197..01e364d 100644
--- a/test/4-more-than-10-hosts.bats
+++ b/test/4-more-than-10-hosts.bats
@@ -23,6 +23,9 @@ setup() {
     init_getssl
     create_certificate
     assert_success
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
 }
 
 
@@ -30,7 +33,9 @@ setup() {
     #!FIXME test certificate has been updated
     run ${CODE_DIR}/getssl -f $GETSSL_HOST
     assert_success
-
+    refute_output --regexp '[Ff][Aa][Ii][Ll][Ee][Dd]'
+    refute_output --regexp '[Ee][Rr][Rr][Oo][Rr]'
+    refute_output --regexp '[Ww][Aa][Rr][Nn][Ii][Nn][Gg]'
     # Remove all the dns aliases
     cleanup_environment
     for prefix in a b c d e f g h i j k; do
diff --git a/test/Dockerfile-ubuntu18 b/test/Dockerfile-ubuntu18
index 6dd92c6..1b3765c 100644
--- a/test/Dockerfile-ubuntu18
+++ b/test/Dockerfile-ubuntu18
@@ -13,6 +13,9 @@ RUN mkdir /etc/nginx/pki
 RUN mkdir /etc/nginx/pki/private
 COPY ./test/test-config/nginx-ubuntu-no-ssl /etc/nginx/sites-enabled/default
 
+# Prevent "Can't load /root/.rnd into RNG" error from openssl
+RUN touch /root/.rnd
+
 # BATS (Bash Automated Testings)
 RUN git clone https://github.com/bats-core/bats-core.git /bats-core
 RUN git clone https://github.com/jasonkarns/bats-support /bats-support
diff --git a/test/README.md b/test/README.md
index 9157aa8..98ff929 100644
--- a/test/README.md
+++ b/test/README.md
@@ -12,7 +12,7 @@ docker-compose -f "docker-compose.yml" up -d --build
 Run the tests
 
 ```sh
-docker exec -it getssl bats /getssl/test
+test/run-all-tests.sh
 ```
 
 Run individual test
@@ -25,12 +25,12 @@ Debug (uses helper script to set `CURL_CA_BUNDLE` as pebble uses a local certifi
 otherwise you get a "unknown API version" error)
 
 ```sh
-docker exec -it getssl-<os> /getssl/test/run-test.sh <config-file>`
+docker exec -it getssl-<os> /getssl/test/debug-test.sh <config-file>`
 
 eg.
 
 ```sh
-docker exec -it getssl-ubuntu18 /getssl/test/run-test.sh getssl-http01.cfg
+docker exec -it getssl-ubuntu18 /getssl/test/debug-test.sh getssl-http01.cfg
 ```
 
 ## TODO
diff --git a/test/run-test.sh b/test/debug-test.sh
similarity index 79%
rename from test/run-test.sh
rename to test/debug-test.sh
index b6f7c72..23d1983 100644
--- a/test/run-test.sh
+++ b/test/debug-test.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # This runs getssl outside of the BATS framework for debugging, etc, against pebble
-# Usage: /getssl/test/run-test.sh getssl-http01.cfg
+# Usage: /getssl/test/debug-test.sh getssl-http01.cfg
 
 CONFIG_FILE=$1
 source /getssl/test/test_helper.bash
@@ -11,4 +11,4 @@ export CURL_CA_BUNDLE=/root/pebble-ca-bundle.crt
 
 "${CODE_DIR}/getssl" -c "$GETSSL_HOST" 3>&1
 cp "${CODE_DIR}/test/test-config/${CONFIG_FILE}" "${INSTALL_DIR}/.getssl/${GETSSL_HOST}/getssl.cfg"
-"${CODE_DIR}/getssl" -f -d "$GETSSL_HOST" 3>&1
+"${CODE_DIR}/getssl" -f "$GETSSL_HOST" 3>&1
diff --git a/test/run-all-tests.sh b/test/run-all-tests.sh
new file mode 100644
index 0000000..d0749e1
--- /dev/null
+++ b/test/run-all-tests.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+docker exec -it getssl-centos6 bats /getssl/test
+docker exec -it getssl-ubuntu18 bats /getssl/test