From: Peter van Dijk <peter.van.dijk@powerdns.com>
Date: Mon, 3 Jul 2023 16:00:40 +0000 (+0200)
Subject: debian auth packaging: use sdig for smoke tests
X-Git-Tag: rec-5.0.0-alpha2~45^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef1f2639147d4d28b79f562fd995a925938b9869;p=thirdparty%2Fpdns.git

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 8d18eaf454..f10656d1ae 100755
--- 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 8278ec1528..0078b46624 100755
--- 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 ffda575ee3..a38cae59cb 100644
--- 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 f9dbdb8fb4..71a54e85c1 100755
--- 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 e9bf89145f..fd09deed98 100755
--- 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 ec112d2c05..da1087d73e 100755
--- 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 c10b027e15..ce44af55db 100755
--- 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