[2188] Test loading with comments in strings

Obviously, it fails.

diff --git a/src/bin/loadzone/tests/correct/correct_test.sh.in b/src/bin/loadzone/tests/correct/correct_test.sh.in
index d944451034004193584db6c7819cb524820834d3..e3f6a8414a121a7e0609bfbb0633a6cfa06be079 100755 (executable)
--- a/src/bin/loadzone/tests/correct/correct_test.sh.in
+++ b/src/bin/loadzone/tests/correct/correct_test.sh.in
@@ -48,6 +48,9 @@ ${LOADZONE_PATH}/b10-loadzone -d ${TEST_OUTPUT_PATH}/zone.sqlite3 ttlext.db >> /
 echo "loadzone example.com. from example.db"
 ${LOADZONE_PATH}/b10-loadzone -d ${TEST_OUTPUT_PATH}/zone.sqlite3 example.db >> /dev/null
 
+echo "loadzone comment.example.com. from comment.db"
+${LOADZONE_PATH}/b10-loadzone -d ${TEST_OUTPUT_PATH}/zone.sqlite3 comment.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"
@@ -55,6 +58,7 @@ echo "I:test master file BIND8 compatibility and mixed \$INCLUDE with \$TTL sema
 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"
+echo "I:test master file comments"
 
 ${PYTHON_EXEC} ${TEST_FILE_PATH}/get_zonedatas.py ${TEST_OUTPUT_PATH}/zone.sqlite3 > ${TEST_OUTPUT_PATH}/test.out
 echo "Compare test results."

diff --git a/src/bin/loadzone/tests/correct/get_zonedatas.py b/src/bin/loadzone/tests/correct/get_zonedatas.py
index faa563449c263bd1c418f93726453ec921eb8ab1..5bef90d9fe37cae6dd0ed637dee9ac549cb0ec28 100644 (file)
--- a/src/bin/loadzone/tests/correct/get_zonedatas.py
+++ b/src/bin/loadzone/tests/correct/get_zonedatas.py
@@ -1,7 +1,7 @@
 from isc.datasrc import sqlite3_ds
 import sys
 ZONE_FILE = sys.argv[1]
-zonename_set = ["include.", "ttl1.", "ttl2.", "mix1.", "mix2.", "ttlext.", "example.com."]
+zonename_set = ["include.", "ttl1.", "ttl2.", "mix1.", "mix2.", "ttlext.", "example.com.", "comment.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])

diff --git a/src/bin/loadzone/tests/correct/known.test.out b/src/bin/loadzone/tests/correct/known.test.out
index 8e2fe3cf3cd1adf5e82406d23280608c10b0132a..eec692e97650d422df99e3e661df28e8d9515bab 100644 (file)
--- a/src/bin/loadzone/tests/correct/known.test.out
+++ b/src/bin/loadzone/tests/correct/known.test.out
@@ -77,3 +77,9 @@ 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
+comment.example.com.           60      IN      SOA     ns1.example.com. hostmaster.example.com. 1 43200 900 1814400 7200
+comment.example.com.           60      IN      NS      ns1.example.com.
+comment.example.com.           60      IN      TXT     "Simple text"
+comment.example.com.           60      IN      TXT     "; No comment"
+comment.example.com.           60      IN      TXT     "Also no comment here"
+comment.example.com.           60      IN      TXT     "A combination ; see?"