fixup! manager: files: watchdog: added RPZ files

Author: alesmrazek

tests/packaging/interactive/rpz_watchdog.sh

@@ -10,7 +10,6 @@ rpz_example=$(cat <<EOF
 ok.example.com                    CNAME rpz-passthru.
 EOF
 )
-
 # create example RPZ
 echo "$rpz_example" >> $rpz_file
 
@@ -21,14 +20,8 @@ local-data:
       watchdog: false
 EOF
 )
-
-# configure RPZ file
+# add RPZ to config
 echo "$rpz_conf" >> /etc/knot-resolver/config.yaml
-kresctl reload
-if [ "$?" -ne "0" ]; then
-    echo "Could not set RPZ."
-    exit 1
-fi
 
 function count_errors(){
     echo "$(journalctl -u knot-resolver.service | grep -c error)"
@@ -38,35 +31,39 @@ function count_reloads(){
     echo "$(journalctl -u knot-resolver.service | grep -c "Reloading policy rules has finished")"
 }
 
-# test that RPZ watchdog is turned off
+# test that RPZ watchdog
 # {{
 
 err_count=$(count_errors)
 rel_count=$(count_reloads)
 
+# reload config with RPZ configured without watchdog turned on
+kresctl reload
+sleep 1
 if [ $(count_errors) -ne $err_count ] || [ $(count_reloads) -ne $rel_count ]; then
     echo "RPZ file watchdog is running (should not) or other errors occurred."
     exit 1
 fi
 
-# }}
-
 # configure RPZ file and turn on watchdog
 kresctl config set -p /local-data/rpz/0/watchdog true
+sleep 1
 if [ "$?" -ne "0" ]; then
     echo "Could not turn on RPZ file watchdog."
     exit 1
 fi
 
-# test modification
+# }}
+
+# test RPZ modification
 # {{
 
 # modify RPZ file, it will trigger reload
 rel_count=$(count_reloads)
 echo "32.1.2.0.192.rpz-client-ip        CNAME rpz-passthru." >> $rpz_file
 
 # wait for files reload to finish
-sleep 10
+sleep 6
 
 if [ $(count_errors) -ne $err_count ] || [ $(count_reloads) -eq $rel_count ]; then
     echo "Could not reload modified RPZ file."