Merge pull request #490 from srvrco/improve-tests

Improve tests

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
 }

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
 }

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

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

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

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