Review remarks from Habbie

diff --git a/regression-tests.recursor-dnssec/runtests b/regression-tests.recursor-dnssec/runtests
index df3a4fb3c1025a981c8e2e875a5623b2ada0de9c..600d681adf2351f37f9d6cb7949b6b7e4208febf 100755 (executable)
--- a/regression-tests.recursor-dnssec/runtests
+++ b/regression-tests.recursor-dnssec/runtests
@@ -55,7 +55,7 @@ if ! "$PDNSRECURSOR" --version 2>&1 | grep Features | grep -q dnstap-framestream
   export NODNSTAPTESTS=1
 fi
 
-# libfstrm has a bad interaction with libfaketime on at leas Ubuntu focal
+# libfstrm has a bad interaction with libfaketime on at least Ubuntu Focal.
 # to run the test without LIBFAKETIME, we clear the var if it set to /bin/false
 if [ "$LIBFAKETIME" = "/bin/false" ]; then
   LIBFAKETIME=""

diff --git a/regression-tests/recursor-test b/regression-tests/recursor-test
index 4523fb9c5dac3ba6595e03f6526d1b8ba1d70510..abf63f40bb0eb14817a2b341d9910eade5c6f33e 100755 (executable)
--- a/regression-tests/recursor-test
+++ b/regression-tests/recursor-test
@@ -19,9 +19,9 @@ shards=$5
 
 if [ $IPv6 = 1 ]
 then
-       QLA6=" ::"
+        QLA6=" ::"
 else
-       QLA6=""
+        QLA6=""
 fi
 
 rm -f recursor.pid pdns_recursor.pid
@@ -35,8 +35,8 @@ rm -f recursor.pid pdns_recursor.pid
 sleep 3
 if [ ! -e pdns_recursor.pid ]; then
         cat recursor.log
-       echo Recursor did not start or did not write pdns_recursor.pid, exiting
-       exit 1
+        echo Recursor did not start or did not write pdns_recursor.pid, exiting
+        exit 1
 fi
 
 
@@ -84,11 +84,11 @@ ANANSWER=$[(100*(${DBT_QUEUED}-${DBT_ERRORS}-${DBT_TIMEOUTS}) )/${DBT_QUEUED}]
 
 if [ "$ANANSWER" -ge $THRESHOLD ]
 then
-       echo recursor-bulktest >> passed_tests
-       RETVAL=0
+        echo recursor-bulktest >> passed_tests
+        RETVAL=0
 else
-       echo recursor-bulktest >> failed_tests
-       RETVAL=1
+    echo recursor-bulktest >> failed_tests
+    RETVAL=1
 fi
 
 echo "$DBT_OKPERCENTAGE% of domains resolved" > recursor-bulktest/diff

diff --git a/tasks.py b/tasks.py
index 5350513943d1672668d3f214f2a655a348b9b549..d01735e213db04f8ff3e38b119ebf96c885431d7 100644 (file)
--- a/tasks.py
+++ b/tasks.py
@@ -53,17 +53,17 @@ rec_build_deps = [
 ]
 rec_bulk_deps = [
     'curl',
-    'unzip',
-    'moreutils',
-    'pdns-tools',
-    'libluajit-5.1-2',
     'libboost-all-dev',
     'libcap2',
+    'libfstrm0',
+    'libluajit-5.1-2',
+    'libsnmp35',
+    'libsodium23',
     'libssl1.1',
     'libsystemd0',
-    'libsodium23',
-    'libfstrm0',
-    'libsnmp35'
+    'moreutils',
+    'pdns-tools',
+    'unzip'
 ]
 dnsdist_build_deps = [
     'libcap-dev',