[svn] commit: r2215 - in /branches/tingting-loadzone/src/bin/loadzone/tests/correct: clean.sh correct_test.sh.in get_zonedatas.py known.dig.out known.test.out

[BIND 10 source code commits]

Author: shentingting
Date: Tue Jun 22 09:38:35 2010
New Revision: 2215

Log:
ticket 175. checking test results using data source API

Added:
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/get_zonedatas.py   (with props)
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.test.out
Removed:
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.dig.out
Modified:
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/clean.sh Tue Jun 22 09:38:35 2010
@@ -1,3 +1,3 @@
 #!/bin/sh
-rm -f /usr/local/var/bind10-devel/zone.sqlite3
-rm -f dig.out
+rm -f ./zone.sqlite3
+rm -f loadzone.out

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in Tue Jun 22 09:38:35 2010
@@ -24,42 +24,33 @@
 LOADZONE_PATH=@abs_top_srcdir@/src/bin/loadzone
 status=0
 echo "Loadzone include. from include.db file"
-${LOADZONE_PATH}/b10-loadzone include.db >> /dev/null
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 include.db >> /dev/null
 
 echo "loadzone  ttl1. from ttl1.db file"
-${LOADZONE_PATH}/b10-loadzone ttl1.db >> /dev/null
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 ttl1.db >> /dev/null
 
 echo "loadzone ttl2. from ttl2.db file"
-${LOADZONE_PATH}/b10-loadzone ttl2.db >> /dev/null
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 ttl2.db >> /dev/null
 
 echo "loadzone mix1. from mix1.db"
-${LOADZONE_PATH}/b10-loadzone mix1.db >> /dev/null
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 mix1.db >> /dev/null
 
 echo "loadzone mix2. from mix2.db"
-${LOADZONE_PATH}/b10-loadzone mix2.db >> /dev/null
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 mix2.db >> /dev/null
 
 echo "loadzone ttlext. from ttlext.db"
-${LOADZONE_PATH}/b10-loadzone ttlext.db >> /dev/null
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 ttlext.db >> /dev/null
 
 echo "I:test master file \$INCLUDE semantics"
-dig +nostats +nocmd include. axfr @127.0.0.1 -p 5300 >dig.out
+echo "I:test master file BIND 8 compatibility TTL and \$TTL semantics"
+echo "I:test master file RFC1035 TTL and \$TTL semantics"
+echo "I:test master file BIND8 compatibility and mixed \$INCLUDE with \$TTL semantics"
+echo "I:test master file RFC1035 TTL and mixed \$INCLUDE with \$TTL semantics"
+echo "I:test master file BIND9 extenstion of TTL"
 
-echo "I:test master file BIND 8 compatibility TTL and \$TTL semantics"
-dig +nostats +nocmd ttl1. axfr @127.0.0.1 -p 5300 >>dig.out
+${PYTHON_EXEC} get_zonedatas.py > test.out
 
-echo "I:test master file RFC1035 TTL and \$TTL semantics"
-dig +nostats +nocmd ttl2. axfr @127.0.0.1 -p 5300 >>dig.out
-
-echo "I:test master file BIND8 compatibility and mixed \$INCLUDE with \$TTL semantics"
-dig +nostats +nocmd mix1. axfr @127.0.0.1 -p 5300 >> dig.out
-
-echo "I:test master file RFC1035 TTL and mixed \$INCLUDE with \$TTL semantics"
-dig +nostats +nocmd mix2. axfr @127.0.0.1 -p 5300 >> dig.out
-
-echo "I:test master file BIND9 extenstion of TTL"
-dig +nostats +nocmd ttlext. axfr @127.0.0.1 -p 5300 >> dig.out
-
-diff dig.out known.dig.out || status=1
+diff test.out known.test.out || status=1
 
 echo "I:exit status: $status"
 exit $status