[svn] commit: r2339 - in /branches/tingting-loadzone/src: bin/loadzone/tests/error/error_test.sh.in lib/python/isc/datasrc/master.py

[BIND 10 source code commits]

Author: shentingting
Date: Wed Jun 30 03:28:39 2010
New Revision: 2339

Log:
made a few minor points after Shane reviewed

Modified:
    branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in
    branches/tingting-loadzone/src/lib/python/isc/datasrc/master.py

Modified: branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in
==============================================================================
--- branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in (original)
+++ branches/tingting-loadzone/src/bin/loadzone/tests/error/error_test.sh.in Wed Jun 30 03:28:39 2010
@@ -27,40 +27,41 @@
 cd ${LOADZONE_PATH}/tests/error
 
 echo "Test no \$ORIGIN error in zone file"
-${LOADZONE_PATH}/b10-loadzone originerr1.db 1> /dev/null 2> error.out
-${LOADZONE_PATH}/b10-loadzone originerr2.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  originerr1.db 1> /dev/null 2> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  originerr2.db 1> /dev/null 2>> error.out
 
 echo "Test: key word TTL spell error"
-${LOADZONE_PATH}/b10-loadzone keyerror1.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  keyerror1.db 1> /dev/null 2>> error.out
 
 echo "Test: key word ORIGIN spell error"
-${LOADZONE_PATH}/b10-loadzone keyerror2.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  keyerror2.db 1> /dev/null 2>> error.out
 
 echo "Test: key INCLUDE spell error"
-${LOADZONE_PATH}/b10-loadzone keyerror3.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  keyerror3.db 1> /dev/null 2>> error.out
 
 echo "Test: include formal error, miss filename"
-${LOADZONE_PATH}/b10-loadzone formerr1.db 1> /dev/null 2>>error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  formerr1.db 1> /dev/null 2>>error.out
 
 echo "Test: include form error, domain is not absolute"
-${LOADZONE_PATH}/b10-loadzone formerr2.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  formerr2.db 1> /dev/null 2>> error.out
 
 echo "Test: TTL form error, no ttl value"
-${LOADZONE_PATH}/b10-loadzone formerr3.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  formerr3.db 1> /dev/null 2>> error.out
 
 echo "Test: TTL form error, ttl value error"
-${LOADZONE_PATH}/b10-loadzone formerr4.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  formerr4.db 1> /dev/null 2>> error.out
 
 echo "Test: rr form error, no type"
-${LOADZONE_PATH}/b10-loadzone formerr5.db 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  formerr5.db 1> /dev/null 2>> error.out
 
 echo "Test: zone file is bogus"
-${LOADZONE_PATH}/b10-loadzone bogusfile 1> /dev/null 2>> error.out
+${LOADZONE_PATH}/b10-loadzone -d zone.sqlite3  bogusfile 1> /dev/null 2>> error.out
 
 diff error.out error.known || status=1
 
 echo "Clean tmp file."
 rm -f error.out
+rm -f zone.sqlite3
 
 echo "I:exit status:$status"
 echo "-----------------------------------------------------------------------------"

Modified: branches/tingting-loadzone/src/lib/python/isc/datasrc/master.py
==============================================================================
--- branches/tingting-loadzone/src/lib/python/isc/datasrc/master.py (original)
+++ branches/tingting-loadzone/src/lib/python/isc/datasrc/master.py Wed Jun 30 03:28:39 2010
@@ -18,7 +18,6 @@
 import sys, re, string
 import time
 import os
-import threading
 #########################################################################
 # define exceptions
 #########################################################################
@@ -127,8 +126,8 @@
     if not isttl(s):
         raise MasterFileError('Invalid TTL: ' + s)
     for ttl_expr in re.findall('\d+[wdhms]?', s, re.I):
-        if re.match('\d+$', ttl_expr):
-            ttl = int(ttl_expr[:])
+        if ttl_expr.isdigit():
+            ttl = int(ttl_expr)
             sum += ttl
             continue
         ttl = int(ttl_expr[:-1])