Commit b726ca45 authored by Mark Andrews's avatar Mark Andrews
Browse files

Merge branch...

Merge branch '585-dnssec-coverage-fails-with-typeerror-for-ksk-with-a-deletion-date-set' into 'master'

Resolve "dnssec-coverage fails with TypeError for KSK with a Deletion date set"

Closes #585

See merge request !1133
parents 6ab40c04 02d20a2f
Pipeline #7404 failed with stages
in 13 minutes and 20 seconds
5102. [bug] dnssec-coverage failed to use the default TTL when
checking KSK deletion times leading to a exception.
[GL #585]
5101. [bug] Fix default installation path for Python modules and
remove the dnspython dependency accidentally introduced
by change 4970. [GL #730]
......
......@@ -452,6 +452,10 @@ class dnskey:
if timespan is None:
timespan = self.ttl
if timespan is None:
output("WARNING: Key %s using default TTL." % repr(self))
timespan = (60*60*24)
now = time.time()
d = self.delete()
i = self.inactive()
......
args=
warn=4
error=1
ok=1
retcode=1
match=0
......@@ -127,3 +127,8 @@ $SETTIME -K $dir -I +18mo -D +2y $zsk1 > /dev/null 2>&1
zsk2=`$KEYGEN -K $dir -S $zsk1`
$SETTIME -K $dir -I +16mo $zsk1 > /dev/null 2>&1
ksk1=`$KEYGEN -K $dir -a rsasha1 -3fk example.com`
# Test 12: Too early KSK deletion
dir=12-ksk-deletion
ksk1=`$KEYGEN -K $dir -f KSK -a 8 -b 2048 -I +40d -D +40d example.com`
ksk2=`$KEYGEN -K $dir -S $ksk1.key example.com`
......@@ -70,6 +70,12 @@ for dir in [0-9][0-9]-*; do
ret=1
fi
found=`grep Traceback coverage.$n | wc -l`
if [ $found -ne 0 ]; then
echo "python exception detected"
ret=1
fi
n=`expr $n + 1`
if [ $ret != 0 ]; then echo_i "failed"; fi
status=`expr $status + $ret`
......
......@@ -473,6 +473,7 @@
./bin/tests/system/coverage/10-check-ksk/expect X 2014,2018
./bin/tests/system/coverage/11-cutoff/README X 2014,2018
./bin/tests/system/coverage/11-cutoff/expect X 2014,2018
./bin/tests/system/coverage/12-ksk-deletion/expect X 2018
./bin/tests/system/coverage/clean.sh SH 2013,2014,2016,2018
./bin/tests/system/coverage/setup.sh SH 2013,2014,2016,2017,2018
./bin/tests/system/coverage/tests.sh SH 2013,2014,2016,2018
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment