Fix system test .status file cleanup

(cherry picked from commit 6495e59a4cc5a82833db84eb2b0debc6b941e141)

diff --git a/bin/tests/system/checkds/clean.sh b/bin/tests/system/checkds/clean.sh
index 99bafb9829955f90e533b7586f2c0316351c27d3..bb0bf1c4eac291fb233f9afdcb29e16544bf585b 100644 (file)
--- a/bin/tests/system/checkds/clean.sh
+++ b/bin/tests/system/checkds/clean.sh
@@ -21,5 +21,4 @@ rm -f ns*/keygen.out.* ns*/settime.out.* ns*/signer.out.*
 rm -f ns*/managed-keys.bind*
 rm -f ns*/*.mkeys
 rm -f ns*/zones
-rm -f tests-checkds.py.status
 rm -f *.checkds.out

diff --git a/bin/tests/system/run.sh b/bin/tests/system/run.sh
index 84d576853c3586f0c3f07621b35ed9ef97c4c749..8b36eb475dca54ad9e81ae90c642ed59899fd6b4 100755 (executable)
--- a/bin/tests/system/run.sh
+++ b/bin/tests/system/run.sh
@@ -228,6 +228,7 @@ if [ $status -eq 0 ]; then
     if [ -n "$PYTEST" ]; then
         run=$((run+1))
         for test in $(cd "${systest}" && find . -name "tests*.py"); do
+            rm -f "$systest/$test.status"
             if start_servers; then
                 rm -f "$systest/$test.status"
                 test_status=0
@@ -243,6 +244,7 @@ if [ $status -eq 0 ]; then
                 break
             fi
         done
+        rm -f "$systest/$test.status"
     else
         echoinfo "I:$systest:pytest not installed, skipping python tests"
     fi

diff --git a/bin/tests/system/shutdown/clean.sh b/bin/tests/system/shutdown/clean.sh
index 8c82e0ed6b90da0f4765e5f032cfa843f16c6a4f..663bc248852a1a54d3ddae46d99dc94d06191476 100644 (file)
--- a/bin/tests/system/shutdown/clean.sh
+++ b/bin/tests/system/shutdown/clean.sh
@@ -14,4 +14,3 @@ rm -f ns*/rpz*.txt
 rm -f */named.conf
 rm -f */named.run
 rm -rf __pycache__
-rm -f *.status