Changeset 262 for test

Timestamp:

06/17/11 13:51:31 (14 years ago)

Author:

tim

Message:

changed regfi_conv_charset to handle memory allocation
tweaked test cases
corrected some documentation

File:

• test/pyregfi-smoketest.py (modified) (6 diffs)

test/pyregfi-smoketest.py

@@ -65 +65 @@
         path = getCurrentPath(k)
         try:
+            print(repr(path))
             hive_iter = hive.subtree(path)
             if hive_iter.current_key() != k:
@@ -174 +175 @@
                 ssk = hive_iter.find_subkey(sk.name)
                 if ssk != None:
-                    sk_stat += len(ssk.name)
+                    if ssk.name != None:
+                        sk_stat += len(ssk.name)
                 else:
                     print("WARNING: ssk was None")
@@ -183 +185 @@
                 vv = hive_iter.find_value(v.name)
                 if vv != None:
-                    v_stat += len(vv.name)
+                    if vv.name != None:
+                        v_stat += len(vv.name)
                 else:
                     print("WARNING: vv was None")
@@ -230 +233 @@
 
 def loopSecurity(hive, fh):
-    start = hive.root.fetch_security()
-    print(start.descriptor.group)
-    cur = start.next_security()
-
-    while cur != start:
-        print(start.descriptor.group)
-        cur = cur.next_security()
+    cur = hive.root.fetch_security()
+    while True:
+        stat += len(cur.descriptor.owner)
+        stat += len(cur.descriptor.group)
+        if cur.descriptor.sacl:
+            stat += len(cur.descriptor.sacl)
+        if cur.descriptor.dacl:
+            stat += len(cur.descriptor.dacl)
+        
+        nxt = cur.next_security()
+        if cur == nxt:
+            break
 
     
@@ -278 +286 @@
 
 def usage():
-    sys.stderr.write("USAGE: pyregfi-smoketest.py test1[,test2[,...]] hive1 [hive2 ...]\n")
+    sys.stderr.write("USAGE: pyregfi-smoketest.py { test1[,test2[,...]] | * } hive1 [hive2 ...]\n")
     sys.stderr.write("\tAvailable tests:\n")
     for t in tests.keys():
@@ -288 +296 @@
     sys.exit(1)
 
-selected_tests = sys.argv[1].split(',')
-for st in selected_tests:
-    if st not in tests:
-        usage()
-        sys.stderr.write("ERROR: %s not a valid test type\n\n" % st)
-        sys.exit(1)
+if sys.argv[1] == '*':
+    selected_tests = tests.keys()
+else:
+    selected_tests = sys.argv[1].split(',')
+    for st in selected_tests:
+        if st not in tests:
+            usage()
+            sys.stderr.write("ERROR: %s not a valid test type\n\n" % st)
+            sys.exit(1)
 
 files = []