summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 10:24:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-09-13 10:24:53 +0000
commit7f6ca6454da250974c309af1f7c11f76161dc1f7 (patch)
tree39aa0647a461f058d03c10b1ae70c78e1b6d678f
parentReleasing progress-linux version 3.0.0-4~dschinn1. (diff)
downloadknot-resolver-7f6ca6454da250974c309af1f7c11f76161dc1f7.zip
knot-resolver-7f6ca6454da250974c309af1f7c11f76161dc1f7.tar.xz
Merging debian version 3.0.0-5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog8
-rw-r--r--debian/tests/control4
-rwxr-xr-xdebian/tests/roundtrip8
3 files changed, 15 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 874bd78..7722a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+knot-resolver (3.0.0-5) unstable; urgency=medium
+
+ * roundtrip test: increase verbosity
+ * roundtrip test: avoid long timeouts if UDP query fails
+ * autopkgtest: improve call to "make installcheck"
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net> Fri, 31 Aug 2018 21:10:39 -0400
+
knot-resolver (3.0.0-4~dschinn1) dschinn-backports; urgency=medium
* Uploading to dschinn-backports, remaining changes:
diff --git a/debian/tests/control b/debian/tests/control
index 5eec04b..f270bf0 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,5 @@
-Test-Command: make installcheck
-Depends: @, @builddeps@
+Test-Command: make -k installcheck V=1 PREFIX=/usr ROOTHINTS=/usr/share/dns/root.hints KEYFILE_DEFAULT=/usr/share/dns/root.key
+Depends: @, @builddeps@, lua-cqueues
Tests: roundtrip
Depends: gnutls-bin, knot-dnsutils, knot-resolver, socat
diff --git a/debian/tests/roundtrip b/debian/tests/roundtrip
index af2661e..a4cf6a1 100755
--- a/debian/tests/roundtrip
+++ b/debian/tests/roundtrip
@@ -19,7 +19,7 @@ ip="${TESTIP:-127.$(( $RANDOM % 256 )).$(( $RANDOM % 256 )).$(( $RANDOM % 256 ))
kresd="${KRESD:-/usr/sbin/kresd}"
kdig="${KDIG:-$(which kdig)}"
-declare -a kresd_args=(--addr="$ip@8053" --tls="$ip@8853" --forks=1 --config="$d/kresd.conf" --quiet)
+declare -a kresd_args=(--addr="$ip@8053" --tls="$ip@8853" --forks=1 --config="$d/kresd.conf" --verbose --verbose --verbose)
if [ -n "$MODULE_DIR" ]; then
kresd_args+=(-m "$MODULE_DIR")
fi
@@ -36,8 +36,9 @@ cleanup () {
find "$d" -ls
tail -n +1 -v "$d"/*.err
echo 'quit()' | socat STDIO "UNIX-CONNECT:$(echo "$d/tty/"*)"
+ wait %1
if [ "$remove" ]; then
- printf "cleaning up working directory %s\n" "$remove"
+ printf "\ncleaning up working directory %s\n" "$remove"
rm -rf "$remove"
fi
}
@@ -73,6 +74,7 @@ certtool --stdout-info --generate-certificate --load-ca-privkey "$d/ca-key.pem"
section "set up kresd daemon on $ip on ports 8053 (UDP, TCP) and 8853 (TLS)"
cat > "$d/kresd.conf" <<EOF
+verbose(true)
modules = { 'hints > iterate' }
net.tls("$d/ee-cert.pem", "$d/ee-key.pem")
hints["monkeys.example"] = "127.15.23.5"
@@ -82,7 +84,7 @@ EOF
sleep 1
section "test UDP with kdig"
-x=$("$kdig" +short @"$ip:8053" monkeys.example)
+x=$("$kdig" +short +time=2 +retry=0 @"$ip:8053" monkeys.example)
[ "$x" = "127.15.23.5" ]
echo "successful UDP request to $ip on port 8053"