[svn] commit: r2261 - in /branches/tingting-loadzone/src/bin/loadzone/tests/correct: correct_test.sh.in example.db get_zonedatas.py known.test.out

[BIND 10 source code commits]

Author: shentingting
Date: Thu Jun 24 09:44:22 2010
New Revision: 2261

Log:
big fix. ticket#244. add a test file

Added:
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/example.db
Modified:
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/correct_test.sh.in
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/get_zonedatas.py
    branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.test.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 Thu Jun 24 09:44:22 2010
@@ -42,12 +42,16 @@
 echo "loadzone ttlext. from ttlext.db"
 ${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 ttlext.db >> /dev/null
 
+echo "loadzone example.com. from example.db"
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3 example.db >> /dev/null
+
 echo "I:test master file \$INCLUDE semantics"
 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 RFC1035 missing CLASS, TTL, NAME semantics"
 
 ${PYTHON_EXEC} get_zonedatas.py > test.out
 echo "Compare test results."
@@ -58,7 +62,7 @@
 rm -f test.out
 echo "I:exit status: $status"
 echo "------------------------------------------------------------------------------"
-echo "Ran 6 test files"
+echo "Ran 7 test files"
 echo ""
 if [ "$status" -eq 1 ] ;then
     echo "ERROR"

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/get_zonedatas.py
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/get_zonedatas.py (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/get_zonedatas.py Thu Jun 24 09:44:22 2010
@@ -1,7 +1,7 @@
 from isc.datasrc import sqlite3_ds
 import sys
 ZONE_FILE = "zone.sqlite3"
-zonename_set = ["include.", "ttl1.", "ttl2.", "mix1.", "mix2.", "ttlext."]
+zonename_set = ["include.", "ttl1.", "ttl2.", "mix1.", "mix2.", "ttlext.", "example.com."]
 for zone_name in zonename_set:
     for rr_data in sqlite3_ds.get_zone_datas(zone_name, ZONE_FILE):
         data_len = len(rr_data[2])

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.test.out
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.test.out (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/correct/known.test.out Thu Jun 24 09:44:22 2010
@@ -66,3 +66,14 @@
 d.ttlext.		600	IN	TXT	"default ttl 600"
 e.ttlext.		4	IN	TXT	"explicit ttl 4"
 f.ttlext.		600	IN	TXT	"default ttl 600"
+example.com.		60	IN	SOA	ns1.example.com. hostmaster.example.com. 1 43200 900 1814400 7200
+example.com.		20	IN	NS	ns1.example.com.
+example.com.		60	IN	NS	ns2.example.com.
+ns1.example.com.		30	IN	A	192.168.1.102
+ns1.example.com.		70	IN	NS	ns3.example.com.
+ns1.example.com.		60	IN	NS	ns4.example.com.
+ns1.example.com.		10	IN	MX	10 mail.example.com.
+ns2.example.com.		80	IN	A	1.1.1.1
+ns3.example.com.		60	IN	A	2.2.2.2
+ns4.example.com.		60	IN	A	3.3.3.3
+ns5.example.com.		90	IN	A	4.4.4.4