Skip to content

Commit 7ea26f2

Browse files
cytopiacytopia
committed
Show test output on failure
1 parent 38dcd4d commit 7ea26f2

5 files changed

Lines changed: 30 additions & 4 deletions

File tree

‎tests/02-wildcard-addr.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"
2828
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
2929
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
3030
echo "FAILED: t1.devilbox is not resolvable to 1.1.1.1"
31+
run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox"
3132
run "docker logs ${NAME}"
3233
run "docker stop ${NAME}"
3334
echo "ABORT..."
@@ -46,6 +47,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"
4647
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
4748
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
4849
echo "FAILED: t1.devilbox is not resolvable to 1.1.1.1"
50+
run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox"
4951
run "docker logs ${NAME}"
5052
run "docker stop ${NAME}"
5153
echo "ABORT..."
@@ -64,6 +66,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"
6466
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
6567
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
6668
echo "FAILED: t1.devilbox is not resolvable to 1.1.1.1"
69+
run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox"
6770
run "docker logs ${NAME}"
6871
run "docker stop ${NAME}"
6972
echo "ABORT..."
@@ -82,6 +85,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"
8285
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
8386
if ! run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox | grep -E '^1\.1\.1\.1$'"; then
8487
echo "FAILED: t1.devilbox is not resolvable to 1.1.1.1"
88+
run "dig @127.0.0.1 -p ${PORT} +short t1.devilbox"
8589
run "docker logs ${NAME}"
8690
run "docker stop ${NAME}"
8791
echo "ABORT..."

‎tests/03-wildcard-cname.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
2828
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
2929
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
3030
echo "FAILED: www.devilbox is not resolvable"
31+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
3132
run "docker logs ${NAME}"
3233
run "docker stop ${NAME}"
3334
echo "ABORT..."
@@ -46,6 +47,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
4647
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
4748
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
4849
echo "FAILED: www.devilbox is not resolvable"
50+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
4951
run "docker logs ${NAME}"
5052
run "docker stop ${NAME}"
5153
echo "ABORT..."
@@ -64,6 +66,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
6466
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
6567
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
6668
echo "FAILED: www.devilbox is not resolvable"
69+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
6770
run "docker logs ${NAME}"
6871
run "docker stop ${NAME}"
6972
echo "ABORT..."
@@ -82,6 +85,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
8285
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
8386
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
8487
echo "FAILED: www.devilbox is not resolvable"
88+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
8589
run "docker logs ${NAME}"
8690
run "docker stop ${NAME}"
8791
echo "ABORT..."

‎tests/04-extrahosts-addr.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\
2828
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
2929
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
3030
echo "FAILED: www.devilbox is not resolvable to 1.1.1.1"
31+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
3132
run "docker logs ${NAME}"
3233
run "docker stop ${NAME}"
3334
echo "ABORT..."
@@ -50,6 +51,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\
5051
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
5152
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
5253
echo "FAILED: www.devilbox is not resolvable to 1.1.1.1"
54+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
5355
run "docker logs ${NAME}"
5456
run "docker stop ${NAME}"
5557
echo "ABORT..."
@@ -72,6 +74,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\
7274
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
7375
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
7476
echo "FAILED: www.devilbox is not resolvable to 1.1.1.1"
77+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
7578
run "docker logs ${NAME}"
7679
run "docker stop ${NAME}"
7780
echo "ABORT..."
@@ -94,6 +97,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\
9497
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
9598
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | grep -Eq '^1\.1\.1\.1$'; then
9699
echo "FAILED: www.devilbox is not resolvable to 1.1.1.1"
100+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
97101
run "docker logs ${NAME}"
98102
run "docker stop ${NAME}"
99103
echo "ABORT..."

‎tests/05-extrahosts-cname.sh‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,17 @@ WAIT=10
2424
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e 'EXTRA_HOSTS=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
2525
run "sleep ${WAIT}"
2626
sanity_check "${NAME}"
27-
if [ "$( run "dig @127.0.0.1 -p ${PORT} +short www.devilbox" "0" "1" | wc -l )" = "0" ]; then
28-
echo "FAILED: Not exactly one line retrieved from dig command"
29-
run "docker stop ${NAME}"
30-
exit 1
27+
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
28+
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
29+
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
30+
echo "FAILED: www.devilbox is not resolvable"
31+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
32+
run "docker logs ${NAME}"
33+
run "docker stop ${NAME}"
34+
echo "ABORT..."
35+
exit 1
36+
fi
37+
fi
3138
fi
3239
if [ "$( dig @127.0.0.1 -p ${PORT} +short t1.devilbox | wc -l )" != "0" ]; then
3340
run "docker stop ${NAME}"
@@ -44,6 +51,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
4451
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
4552
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
4653
echo "FAILED: www.devilbox is not resolvable"
54+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
4755
run "docker logs ${NAME}"
4856
run "docker stop ${NAME}"
4957
echo "ABORT..."
@@ -66,6 +74,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
6674
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
6775
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
6876
echo "FAILED: www.devilbox is not resolvable"
77+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
6978
run "docker logs ${NAME}"
7079
run "docker stop ${NAME}"
7180
echo "ABORT..."
@@ -88,6 +97,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9
8897
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
8998
if ! run "dig @127.0.0.1 -p ${PORT} +short www.devilbox | grep -E '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$'"; then
9099
echo "FAILED: www.devilbox is not resolvable"
100+
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox"
91101
run "docker logs ${NAME}"
92102
run "docker stop ${NAME}"
93103
echo "ABORT..."

‎tests/06-ttl-time.sh‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+5
2828
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
2929
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
3030
echo "FAILED: www.devilbox with TTL time not found"
31+
run "dig @127.0.0.1 -p ${PORT} www.devilbox"
3132
run "docker logs ${NAME}"
3233
run "docker stop ${NAME}"
3334
echo "ABORT..."
@@ -46,6 +47,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+5
4647
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
4748
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
4849
echo "FAILED: www.devilbox with TTL time not found"
50+
run "dig @127.0.0.1 -p ${PORT} www.devilbox"
4951
run "docker logs ${NAME}"
5052
run "docker stop ${NAME}"
5153
echo "ABORT..."
@@ -64,6 +66,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+5
6466
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
6567
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
6668
echo "FAILED: www.devilbox with TTL time not found"
69+
run "dig @127.0.0.1 -p ${PORT} www.devilbox"
6770
run "docker logs ${NAME}"
6871
run "docker stop ${NAME}"
6972
echo "ABORT..."
@@ -82,6 +85,7 @@ if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+5
8285
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
8386
if ! run "dig @127.0.0.1 -p ${PORT} www.devilbox | grep -E '^www\.devilbox\.\s+500\s+IN\s+A'"; then
8487
echo "FAILED: www.devilbox with TTL time not found"
88+
run "dig @127.0.0.1 -p ${PORT} www.devilbox"
8589
run "docker logs ${NAME}"
8690
run "docker stop ${NAME}"
8791
echo "ABORT..."

0 commit comments

Comments
 (0)