From beeaefb401cb115749ea59c3549c29d97f1d7e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20K=C4=99pie=C5=84?= Date: Thu, 28 Feb 2019 12:33:07 +0100 Subject: [PATCH] Call clean.sh from all relevant setup.sh scripts For all system tests utilizing named instances, call clean.sh from each test's setup.sh script in a consistent way to make sure running the same system test multiple times using run.sh does not trigger false positives caused by stale files created by previous runs. Ideally we would just call clean.sh from run.sh, but that would break some quirky system tests like "rpz" or "rpzrecurse" and being consistent for the time being does not hurt. (cherry picked from commit a077a3ae8a5013e089bb4e6f9ab8137c5b708dce) --- bin/tests/system/allow-query/setup.sh | 2 ++ bin/tests/system/autosign/setup.sh | 2 +- bin/tests/system/case/setup.sh | 3 ++- bin/tests/system/dlv/setup.sh | 2 ++ bin/tests/system/dlzexternal/setup.sh | 2 ++ bin/tests/system/dsdigest/setup.sh | 2 ++ bin/tests/system/dupsigs/setup.sh | 2 +- bin/tests/system/ecdsa/setup.sh | 2 ++ bin/tests/system/eddsa/setup.sh | 2 ++ bin/tests/system/gost/setup.sh | 2 ++ bin/tests/system/ixfr/setup.sh | 2 ++ bin/tests/system/masterformat/setup.sh | 2 ++ bin/tests/system/metadata/setup.sh | 2 +- bin/tests/system/pending/setup.sh | 2 ++ bin/tests/system/pkcs11/setup.sh | 2 ++ bin/tests/system/pkcs11ssl/setup.sh | 2 ++ bin/tests/system/resolver/setup.sh | 2 ++ bin/tests/system/staticstub/setup.sh | 2 ++ bin/tests/system/stress/setup.sh | 5 +++++ 19 files changed, 38 insertions(+), 4 deletions(-) diff --git a/bin/tests/system/allow-query/setup.sh b/bin/tests/system/allow-query/setup.sh index 10b3c934a5..da2e3d79e2 100644 --- a/bin/tests/system/allow-query/setup.sh +++ b/bin/tests/system/allow-query/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + copy_setports ../common/controls.conf.in ns2/controls.conf copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named01.conf.in ns2/named.conf diff --git a/bin/tests/system/autosign/setup.sh b/bin/tests/system/autosign/setup.sh index b6c9c50f99..d04450b667 100644 --- a/bin/tests/system/autosign/setup.sh +++ b/bin/tests/system/autosign/setup.sh @@ -12,7 +12,7 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -. ./clean.sh +$SHELL clean.sh test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE diff --git a/bin/tests/system/case/setup.sh b/bin/tests/system/case/setup.sh index 066ceb2e0d..53f01c4fc5 100644 --- a/bin/tests/system/case/setup.sh +++ b/bin/tests/system/case/setup.sh @@ -10,7 +10,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -${SHELL} clean.sh +$SHELL clean.sh + cp -f ns1/dynamic.db.in ns1/dynamic.db copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in ns2/named.conf diff --git a/bin/tests/system/dlv/setup.sh b/bin/tests/system/dlv/setup.sh index 5954209490..17b3dbb4e9 100644 --- a/bin/tests/system/dlv/setup.sh +++ b/bin/tests/system/dlv/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/dlzexternal/setup.sh b/bin/tests/system/dlzexternal/setup.sh index 8279398d42..8deb456dab 100644 --- a/bin/tests/system/dlzexternal/setup.sh +++ b/bin/tests/system/dlzexternal/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE $DDNSCONFGEN -q -r $RANDFILE -z example.nil > ns1/ddns.key diff --git a/bin/tests/system/dsdigest/setup.sh b/bin/tests/system/dsdigest/setup.sh index c7ade46d01..66d4af3bb9 100644 --- a/bin/tests/system/dsdigest/setup.sh +++ b/bin/tests/system/dsdigest/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/dupsigs/setup.sh b/bin/tests/system/dupsigs/setup.sh index 50d6bbddca..0cc4048bee 100644 --- a/bin/tests/system/dupsigs/setup.sh +++ b/bin/tests/system/dupsigs/setup.sh @@ -10,7 +10,7 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -test -f clean.sh && $SHELL clean.sh +$SHELL clean.sh test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE diff --git a/bin/tests/system/ecdsa/setup.sh b/bin/tests/system/ecdsa/setup.sh index 7fba74b583..c47b1aab9f 100644 --- a/bin/tests/system/ecdsa/setup.sh +++ b/bin/tests/system/ecdsa/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE cd ns1 && $SHELL sign.sh diff --git a/bin/tests/system/eddsa/setup.sh b/bin/tests/system/eddsa/setup.sh index 7fba74b583..c47b1aab9f 100644 --- a/bin/tests/system/eddsa/setup.sh +++ b/bin/tests/system/eddsa/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE cd ns1 && $SHELL sign.sh diff --git a/bin/tests/system/gost/setup.sh b/bin/tests/system/gost/setup.sh index 7fba74b583..c47b1aab9f 100644 --- a/bin/tests/system/gost/setup.sh +++ b/bin/tests/system/gost/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE cd ns1 && $SHELL sign.sh diff --git a/bin/tests/system/ixfr/setup.sh b/bin/tests/system/ixfr/setup.sh index 21df2e6bcd..475671e488 100644 --- a/bin/tests/system/ixfr/setup.sh +++ b/bin/tests/system/ixfr/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + rm -f ns1/*.db ns1/*.jnl ns3/*.jnl ns4/*.db ns4/*.jnl cat <ns1/named.conf diff --git a/bin/tests/system/masterformat/setup.sh b/bin/tests/system/masterformat/setup.sh index 872186cede..85842ca97e 100755 --- a/bin/tests/system/masterformat/setup.sh +++ b/bin/tests/system/masterformat/setup.sh @@ -12,6 +12,8 @@ # shellcheck source=conf.sh . "$SYSTEMTESTTOP/conf.sh" +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/metadata/setup.sh b/bin/tests/system/metadata/setup.sh index 46e2668fd3..ef97541e67 100644 --- a/bin/tests/system/metadata/setup.sh +++ b/bin/tests/system/metadata/setup.sh @@ -12,7 +12,7 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh -$SHELL ./clean.sh +$SHELL clean.sh test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE diff --git a/bin/tests/system/pending/setup.sh b/bin/tests/system/pending/setup.sh index 45b6365107..0dc618c6dd 100644 --- a/bin/tests/system/pending/setup.sh +++ b/bin/tests/system/pending/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE copy_setports ns1/named.conf.in ns1/named.conf diff --git a/bin/tests/system/pkcs11/setup.sh b/bin/tests/system/pkcs11/setup.sh index 4fc5ec5b99..1d7325ae8a 100644 --- a/bin/tests/system/pkcs11/setup.sh +++ b/bin/tests/system/pkcs11/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + infile=ns1/example.db.in /bin/echo -n ${HSMPIN:-1234}> pin diff --git a/bin/tests/system/pkcs11ssl/setup.sh b/bin/tests/system/pkcs11ssl/setup.sh index d2fbe922c7..65857356d7 100644 --- a/bin/tests/system/pkcs11ssl/setup.sh +++ b/bin/tests/system/pkcs11ssl/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + infile=ns1/example.db.in /bin/echo -n ${HSMPIN:-1234}> pin diff --git a/bin/tests/system/resolver/setup.sh b/bin/tests/system/resolver/setup.sh index 9926dc6976..0f9605ef11 100644 --- a/bin/tests/system/resolver/setup.sh +++ b/bin/tests/system/resolver/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + test -r $RANDFILE || $GENRANDOM $RANDOMSIZE $RANDFILE cp ns4/tld1.db ns4/tld.db diff --git a/bin/tests/system/staticstub/setup.sh b/bin/tests/system/staticstub/setup.sh index c8865d6007..8c01ec4709 100755 --- a/bin/tests/system/staticstub/setup.sh +++ b/bin/tests/system/staticstub/setup.sh @@ -12,6 +12,8 @@ SYSTEMTESTTOP=.. . $SYSTEMTESTTOP/conf.sh +$SHELL clean.sh + copy_setports ns1/named.conf.in ns1/named.conf copy_setports ns2/named.conf.in tmp sed 's/SERVER_CONFIG_PLACEHOLDER/server-names { "ns.example.net"; };/' tmp > ns2/named.conf diff --git a/bin/tests/system/stress/setup.sh b/bin/tests/system/stress/setup.sh index b1798a4bb7..3860848b9d 100644 --- a/bin/tests/system/stress/setup.sh +++ b/bin/tests/system/stress/setup.sh @@ -9,6 +9,11 @@ # See the COPYRIGHT file distributed with this work for additional # information regarding copyright ownership. +# shellcheck source=conf.sh +. "$SYSTEMTESTTOP/conf.sh" + +$SHELL clean.sh + # # Set up test data for zone transfer quota tests. #