Test deprecate dscp configuration

Add 'dscp' token and 'option' to deprecated.conf. It should trigger warnings
(except when deprecation warnings are being ignored).

diff --git a/bin/tests/system/checkconf/deprecated.conf b/bin/tests/system/checkconf/deprecated.conf
index 44607a042bf963eba4e82d29dac03fcdb95fa7cf..82a555d98b30ca9b84a0846772e27cf72ee3fe99 100644 (file)
--- a/bin/tests/system/checkconf/deprecated.conf
+++ b/bin/tests/system/checkconf/deprecated.conf
@@ -11,8 +11,13 @@
  * information regarding copyright ownership.
  */
 
+server 1.2.3.4 {
+       query-source 10.10.10.10 dscp 10;
+};
+
 options {
        dnssec-validation yes;
+       dscp 10;
 };
 
 trusted-keys {

diff --git a/bin/tests/system/checkconf/tests.sh b/bin/tests/system/checkconf/tests.sh
index d625fd5aeb428df1ada96debf765d4f2b99ee8c6..c978efe347e777b45ed72d81c2b5e1362326e88b 100644 (file)
--- a/bin/tests/system/checkconf/tests.sh
+++ b/bin/tests/system/checkconf/tests.sh
@@ -143,6 +143,8 @@ ret=0
 $CHECKCONF deprecated.conf > checkconf.out$n.1 2>&1
 grep "option 'managed-keys' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
 grep "option 'trusted-keys' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
+grep "option 'dscp' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
+grep "token 'dscp' is deprecated" < checkconf.out$n.1 > /dev/null || ret=1
 if [ $ret -ne 0 ]; then echo_i "failed"; fi
 status=`expr $status + $ret`
 # set -i to ignore deprecate warnings