Skip to content

Commit 2617331

Browse files
cytopiacytopia
committed
Adjust integration tests
1 parent 23a42e4 commit 2617331

6 files changed

+20
-121
lines changed

‎tests/02-wildcard-addr.sh ‎tests/02-DNS_A_WILDCARD.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ REPS=10
2222

2323

2424
# DEBUG_ENTRYPOINT=2
25-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
25+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'DNS_A=*.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
2626
run "sleep ${WAIT}"
2727
sanity_check "${NAME}"
2828
i=0
@@ -42,7 +42,7 @@ docker_stop "${NAME}"
4242

4343

4444
# DEBUG_ENTRYPOINT=1
45-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
45+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'DNS_A=*.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
4646
run "sleep ${WAIT}"
4747
sanity_check "${NAME}"
4848
i=0
@@ -62,7 +62,7 @@ docker_stop "${NAME}"
6262

6363

6464
# DEBUG_ENTRYPOINT=0
65-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
65+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'DNS_A=*.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
6666
run "sleep ${WAIT}"
6767
sanity_check "${NAME}"
6868
i=0
@@ -82,7 +82,7 @@ docker_stop "${NAME}"
8282

8383

8484
# DEBUG_ENTRYPOINT=null
85-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
85+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'DNS_A=*.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
8686
run "sleep ${WAIT}"
8787
sanity_check "${NAME}"
8888
i=0

‎tests/03-wildcard-cname.sh ‎tests/03-DNS_CNAME_WILDCARD.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ REPS=10
2222

2323

2424
# DEBUG_ENTRYPOINT=2
25-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
25+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'DNS_CNAME=*.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
2626
run "sleep ${WAIT}"
2727
sanity_check "${NAME}"
2828
i=0
@@ -42,7 +42,7 @@ docker_stop "${NAME}"
4242

4343

4444
# DEBUG_ENTRYPOINT=1
45-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
45+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'DNS_CNAME=*.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
4646
run "sleep ${WAIT}"
4747
sanity_check "${NAME}"
4848
i=0
@@ -62,7 +62,7 @@ docker_stop "${NAME}"
6262

6363

6464
# DEBUG_ENTRYPOINT=0
65-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
65+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'DNS_CNAME=*.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
6666
run "sleep ${WAIT}"
6767
sanity_check "${NAME}"
6868
i=0
@@ -82,7 +82,7 @@ docker_stop "${NAME}"
8282

8383

8484
# DEBUG_ENTRYPOINT=null
85-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'WILDCARD_DNS=devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
85+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'DNS_CNAME=*.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
8686
run "sleep ${WAIT}"
8787
sanity_check "${NAME}"
8888
i=0

‎tests/04-extrahosts-addr.sh ‎tests/04-DNS_A.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ REPS=10
2222

2323

2424
# DEBUG_ENTRYPOINT=2
25-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
25+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'DNS_A=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
2626
run "sleep ${WAIT}"
2727
sanity_check "${NAME}"
2828
i=0
@@ -46,7 +46,7 @@ docker_stop "${NAME}"
4646

4747

4848
# DEBUG_ENTRYPOINT=1
49-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
49+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'DNS_A=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
5050
run "sleep ${WAIT}"
5151
sanity_check "${NAME}"
5252
i=0
@@ -70,7 +70,7 @@ docker_stop "${NAME}"
7070

7171

7272
# DEBUG_ENTRYPOINT=0
73-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
73+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'DNS_A=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
7474
run "sleep ${WAIT}"
7575
sanity_check "${NAME}"
7676
i=0
@@ -94,7 +94,7 @@ docker_stop "${NAME}"
9494

9595

9696
# DEBUG_ENTRYPOINT=null
97-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
97+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'DNS_A=www.devilbox=1.1.1.1' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
9898
run "sleep ${WAIT}"
9999
sanity_check "${NAME}"
100100
i=0

‎tests/05-extrahosts-cname.sh ‎tests/05-DNS_CNAME.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ REPS=10
2222

2323

2424
# DEBUG_ENTRYPOINT=2
25-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
25+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e DOCKER_LOGS=1 -e 'DNS_CNAME=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
2626
run "sleep ${WAIT}"
2727
sanity_check "${NAME}"
2828
i=0
@@ -46,7 +46,7 @@ docker_stop "${NAME}"
4646

4747

4848
# DEBUG_ENTRYPOINT=1
49-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
49+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e DOCKER_LOGS=1 -e 'DNS_CNAME=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
5050
run "sleep ${WAIT}"
5151
sanity_check "${NAME}"
5252
i=0
@@ -70,7 +70,7 @@ docker_stop "${NAME}"
7070

7171

7272
# DEBUG_ENTRYPOINT=0
73-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
73+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e DOCKER_LOGS=1 -e 'DNS_CNAME=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
7474
run "sleep ${WAIT}"
7575
sanity_check "${NAME}"
7676
i=0
@@ -94,7 +94,7 @@ docker_stop "${NAME}"
9494

9595

9696
# DEBUG_ENTRYPOINT=null
97-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'EXTRA_HOSTS=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
97+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DOCKER_LOGS=1 -e 'DNS_CNAME=www.devilbox=google.com' -p ${PORT}:53/udp ${IMAGE}:${TAG}"
9898
run "sleep ${WAIT}"
9999
sanity_check "${NAME}"
100100
i=0

‎tests/06-ttl-time.sh

-101
This file was deleted.

‎tests/07-docker-logs.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ REPS=10
2222

2323

2424
# DEBUG_ENTRYPOINT=2
25-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e 'EXTRA_HOSTS=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
25+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=2 -e 'DNS_CNAME=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
2626
run "sleep ${WAIT}"
2727
sanity_check "${NAME}"
2828
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox || true"
@@ -35,7 +35,7 @@ docker_stop "${NAME}"
3535

3636

3737
# DEBUG_ENTRYPOINT=1
38-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e 'EXTRA_HOSTS=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
38+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=1 -e 'DNS_CNAME=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
3939
run "sleep ${WAIT}"
4040
sanity_check "${NAME}"
4141
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox || true"
@@ -48,7 +48,7 @@ docker_stop "${NAME}"
4848

4949

5050
# DEBUG_ENTRYPOINT=0
51-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e 'EXTRA_HOSTS=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
51+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e DEBUG_ENTRYPOINT=0 -e 'DNS_CNAMES=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
5252
run "sleep ${WAIT}"
5353
sanity_check "${NAME}"
5454
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox || true"
@@ -61,7 +61,7 @@ docker_stop "${NAME}"
6161

6262

6363
# DEBUG_ENTRYPOINT=null
64-
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e 'EXTRA_HOSTS=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
64+
run "docker run -d --rm --platform ${ARCH} --name ${NAME} -e DEBUG=${DEBUG} -e 'DNS_CNAME=www.devilbox=google.com' -e DOCKER_LOGS=1 -p ${PORT}:53/udp ${IMAGE}:${TAG}"
6565
run "sleep ${WAIT}"
6666
sanity_check "${NAME}"
6767
run "dig @127.0.0.1 -p ${PORT} +short www.devilbox || true"

0 commit comments

Comments
 (0)