Changeset 252 for test

Timestamp:

05/08/11 13:33:49 (14 years ago)

Author:

tim

Message:

updated pyregfi to work with regfi changes
renamed some functions for more clarity
fixed some issues related to talloc_reference

File:

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

test/pyregfi-smoketest.py

@@ -42 +42 @@
 
 
-# helper function
+# walks up parents to obtain path, rather than using downward links like iterator
 def getCurrentPath(key):
     if key == None:
@@ -71 +71 @@
                 i += 1
         except Exception as e:
-            print("WARNING: Could not decend to path '%s'.\nError:\n %s\n%s" % (path,e.args,e))
+            print("WARNING: Could not descend to path '%s'.\nError:\n %s\n%s" % (path,e.args,e))
     print("   Successfully tested paths on %d keys." % i)
 
@@ -162 +162 @@
     iter = pyregfi.HiveIterator(hive)
     for k in iter:
-        path = getCurrentPath(k)
+        path = iter.current_path()
         try:
-            hive_iter = hive.subtree(path)
+            hive_iter = hive.subtree(path[1:])
             sk = hive_iter.first_subkey()
             while sk != None:
                 ssk = hive_iter.find_subkey(sk.name)
-                sk_stat += len(ssk.name)
+                if ssk != None:
+                    sk_stat += len(ssk.name)
+                else:
+                    print("WARNING: ssk was None")
                 sk = hive_iter.next_subkey()
 
@@ -174 +177 @@
             while v != None:
                 vv = hive_iter.find_value(v.name)
-                v_stat += len(vv.name)
+                if vv != None:
+                    v_stat += len(vv.name)
+                else:
+                    print("WARNING: vv was None")
                 v = hive_iter.next_value()
 
         except Exception as e:
-            print("WARNING: Could not decend to path '%s'.\nError:\n %s\n%s" % (path,e.args,e))
+            print("WARNING: Could not descend to path '%s'.\nError:\n %s\n%s" % (path[1:],e.args,e))
     print("   Subkey stat: %f" % sk_stat)
     print("   Value stat: %f" % v_stat)