From 37d6aeb93b765147483f7c8e0aafdee91661ceaf Mon Sep 17 00:00:00 2001 From: Curtis Blackburn Date: Thu, 10 Dec 2015 13:27:51 -0800 Subject: [PATCH] Revert "[rt40106] add tests for dig +[no]ttlunits" This reverts commit ac91642ba4cbae177a6cb714faedb8c3c70c4093. --- bin/tests/system/digdelv/ns2/example.db | 10 --------- bin/tests/system/digdelv/tests.sh | 27 ------------------------- 2 files changed, 37 deletions(-) diff --git a/bin/tests/system/digdelv/ns2/example.db b/bin/tests/system/digdelv/ns2/example.db index 8cc8ba3f25..0a1aa5d615 100644 --- a/bin/tests/system/digdelv/ns2/example.db +++ b/bin/tests/system/digdelv/ns2/example.db @@ -48,13 +48,3 @@ dnskey 300 DNSKEY 256 3 1 ( b9VIE5x7KNHAYTvTO5d4S8M= ) -; TTL of 3 weeks -weeks 1814400 A 10.53.0.2 -; TTL of 3 days -days 259200 A 10.53.0.2 -; TTL of 3 hours -hours 10800 A 10.53.0.2 -;TTL of 45 minutes -minutes 2700 A 10.53.0.2 -;TTL of 45 seconds -seconds 45 A 10.53.0.2 diff --git a/bin/tests/system/digdelv/tests.sh b/bin/tests/system/digdelv/tests.sh index 41b8f3cb17..aecbf51de4 100644 --- a/bin/tests/system/digdelv/tests.sh +++ b/bin/tests/system/digdelv/tests.sh @@ -128,33 +128,6 @@ if [ -x ${DIG} ] ; then if [ $ret != 0 ]; then echo "I:failed"; fi status=`expr $status + $ret` - echo "I:checking dig +ttlunits works ($n)" - ret=0 - $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A weeks.example > dig.out.test$n || ret=1 - grep "^weeks.example. 3w" < dig.out.test$n > /dev/null || ret=1 - $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A days.example > dig.out.test$n || ret=1 - grep "^days.example. 3d" < dig.out.test$n > /dev/null || ret=1 - $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A hours.example > dig.out.test$n || ret=1 - grep "^hours.example. 3h" < dig.out.test$n > /dev/null || ret=1 - $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A minutes.example > dig.out.test$n || ret=1 - grep "^minutes.example. 45m" < dig.out.test$n > /dev/null || ret=1 - $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits A seconds.example > dig.out.test$n || ret=1 - grep "^seconds.example. 45s" < dig.out.test$n > /dev/null || ret=1 - if [ $ret != 0 ]; then echo "I:failed"; fi - status=`expr $status + $ret` - - n=`expr $n + 1` - echo "I:checking dig respects precedence of options with +ttlunits ($n)" - ret=0 - $DIG $DIGOPTS +tcp @10.53.0.2 +ttlunits +nottlid A weeks.example > dig.out.test$n || ret=1 - grep "^weeks.example. IN" < dig.out.test$n > /dev/null || ret=1 - $DIG $DIGOPTS +tcp @10.53.0.2 +nottlid +ttlunits A weeks.example > dig.out.test$n || ret=1 - grep "^weeks.example. 3w" < dig.out.test$n > /dev/null || ret=1 - $DIG $DIGOPTS +tcp @10.53.0.2 +nottlid +nottlunits A weeks.example > dig.out.test$n || ret=1 - grep "^weeks.example. 1814400" < dig.out.test$n > /dev/null || ret=1 - if [ $ret != 0 ]; then echo "I:failed"; fi - status=`expr $status + $ret` - else echo "$DIG is needed, so skipping these dig tests" fi