debian auth packaging: use sdig for smoke tests

diff --git a/builder-support/debian/authoritative/debian-buster/tests-source/smoke-bind b/builder-support/debian/authoritative/debian-buster/tests-source/smoke-bind
index 8d18eaf4547dade09e423a8a702dd507c18f5eda..f10656d1aec997cdc2e84005c3a3bfeeb9e6602c 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/tests-source/smoke-bind
+++ b/builder-support/debian/authoritative/debian-buster/tests-source/smoke-bind
@@ -31,7 +31,7 @@ EOF
 
 ./launch-pdns
 
-dig -p 5301 @127.0.0.1 smoke.bind.example.org 2>&1 | tee "$TMPFILE"
+../../pdns/sdig 127.0.0.1 5301 smoke.bind.example.org A 2>&1 | tee "$TMPFILE"
 
 if grep -c '127\.0\.0\.123' "$TMPFILE"; then
     echo success

diff --git a/builder-support/debian/authoritative/debian-buster/tests-source/smoke-lmdb b/builder-support/debian/authoritative/debian-buster/tests-source/smoke-lmdb
index 8278ec1528391f5f395adf3c45cc57d0369ec6c1..0078b4662409ef760123e1b04bb3863e3aaf2ea0 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/tests-source/smoke-lmdb
+++ b/builder-support/debian/authoritative/debian-buster/tests-source/smoke-lmdb
@@ -23,7 +23,7 @@ EOF
 
 ./launch-pdns
 
-dig -p 5301 @127.0.0.1 smoke.lmdb.example.org SOA 2>&1 | tee "$TMPFILE"
+../../pdns/sdig 127.0.0.1 5301 smoke.lmdb.example.org SOA 2>&1 | tee "$TMPFILE"
 
 if grep -c 'a.misconfigured' "$TMPFILE"; then
     echo success

diff --git a/builder-support/debian/authoritative/debian-buster/tests/control b/builder-support/debian/authoritative/debian-buster/tests/control
index ffda575ee3f3a1fc09fe00ac1c5623c6ecddaad9..a38cae59cbdca776b684c3313637f241a3ef86f2 100644 (file)
--- a/builder-support/debian/authoritative/debian-buster/tests/control
+++ b/builder-support/debian/authoritative/debian-buster/tests/control
@@ -1,27 +1,27 @@
 Tests: smoke-bind
-Depends: dnsutils,
-         pdns-backend-bind,
-         pdns-server
+Depends: pdns-backend-bind,
+         pdns-server,
+         pdns-tools
 Restrictions: needs-root
 
 Tests: smoke-mysql
-Depends: dnsutils,
-         mariadb-server,
+Depends: mariadb-server,
          pdns-backend-mysql,
-         pdns-server
+         pdns-server,
+         pdns-tools
 Restrictions: needs-root, isolation-container
 
 Tests: smoke-mysql-sp
-Depends: dnsutils,
-         mariadb-server,
+Depends: mariadb-server,
          pdns-backend-mysql,
-         pdns-server
+         pdns-server,
+         pdns-tools
 Restrictions: needs-root, isolation-container
 
 Tests: smoke-pgsql
-Depends: dnsutils,
-         pdns-backend-pgsql,
+Depends: pdns-backend-pgsql,
          pdns-server,
+         pdns-tools,
          postgresql
 Restrictions: needs-root, isolation-container
 

diff --git a/builder-support/debian/authoritative/debian-buster/tests/smoke-bind b/builder-support/debian/authoritative/debian-buster/tests/smoke-bind
index f9dbdb8fb46ca4da6228a5163c203139b4fbbbc7..71a54e85c19613c6c0baadb39db03a656b01a3cf 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/tests/smoke-bind
+++ b/builder-support/debian/authoritative/debian-buster/tests/smoke-bind
@@ -25,7 +25,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-dig @127.0.0.1 smoke.$ZONE 2>&1 | tee "$TMPFILE"
+sdig 127.0.0.1 53 smoke.$ZONE A 2>&1 | tee "$TMPFILE"
 
 if grep -c '127\.0\.0\.222' "$TMPFILE"; then
     echo success

diff --git a/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql b/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql
index e9bf89145f954005deac4698153939c919954bba..fd09deed98044e9f82a363314572cbde3778b538 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql
+++ b/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql
@@ -61,7 +61,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-dig @127.0.0.1 smoke.$ZONE 2>&1 | tee "$TMPFILE"
+sdig 127.0.0.1 53 smoke.$ZONE A 2>&1 | tee "$TMPFILE"
 
 if grep -c '127\.0\.0\.222' "$TMPFILE"; then
     echo success

diff --git a/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql-sp b/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql-sp
index ec112d2c059bec85092586d5fded5d7857271841..da1087d73e0db417ebdea1da96554e1f21b04cbb 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql-sp
+++ b/builder-support/debian/authoritative/debian-buster/tests/smoke-mysql-sp
@@ -72,7 +72,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-dig @127.0.0.1 smoke.$ZONE 2>&1 | tee "$TMPFILE"
+sdig 127.0.0.1 53 smoke.$ZONE A 2>&1 | tee "$TMPFILE"
 
 if grep -c '127\.0\.0\.222' "$TMPFILE"; then
     echo success

diff --git a/builder-support/debian/authoritative/debian-buster/tests/smoke-pgsql b/builder-support/debian/authoritative/debian-buster/tests/smoke-pgsql
index c10b027e153f038f617fc452aed8d532a7577b8d..ce44af55db83e29c8ceb24f74c210007d2c16aff 100755 (executable)
--- a/builder-support/debian/authoritative/debian-buster/tests/smoke-pgsql
+++ b/builder-support/debian/authoritative/debian-buster/tests/smoke-pgsql
@@ -59,7 +59,7 @@ cleanup() {
 }
 trap cleanup EXIT
 
-dig @127.0.0.1 smoke.$ZONE 2>&1 | tee "$TMPFILE"
+sdig 127.0.0.1 53 smoke.$ZONE A 2>&1 | tee "$TMPFILE"
 
 if grep -c '127\.0\.0\.222' "$TMPFILE"; then
     echo success