Changeset 255 for test

Timestamp:

06/13/11 15:15:08 (14 years ago)

Author:

tim

Message:

fixed error condition deadlock in regfi
prevented early garbage collection of hive file handles
fixed module imports under python3

File:

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

test/pyregfi-smoketest.py

@@ -106 +106 @@
     global recurseKey_stat
     global recurseValue_stat
-    recurseKey_stat += (key.mtime.low^key.mtime.high - key.max_bytes_subkeyname) * key.flags
+    recurseKey_stat += (key.mtime - key.max_bytes_subkeyname) * key.flags
     for v in key.values:
         recurseValue_stat += (v.data_off - v.data_size) / (1.0 + v.flags) + v.data_in_offset
-        value = key.values[v.name]
-        if v != value:
-            print("WARNING: iterator value '%s' does not match dictionary value '%s'." 
-                  % (v.name, value.name))
+        try:
+            value = key.values[v.name]
+            if v != value:
+                print("WARNING: iterator value '%s' does not match dictionary value '%s'." 
+                      % (v.name, value.name))
+        except Exception as e:
+                print("WARNING: iterator value name '%s' is not retrievable via value list\n"
+                      % (v.name,))
+        
 
 def recurseTree(cur, operation):
@@ -258 +263 @@
     print("  Security stat: %d" % stat)
 
+
 tests = {
     "iterTallyNames":iterTallyNames,
@@ -286 +292 @@
     if st not in tests:
         usage()
-        sys.stderr.write("ERROR: %s not a valid test type" % st)
+        sys.stderr.write("ERROR: %s not a valid test type\n\n" % st)
         sys.exit(1)
 
@@ -296 +302 @@
 start_time = time.time()
 for hname,fh in files:
-    hive = pyregfi.Hive(fh)
+    #hive = pyregfi.Hive(fh)
+    hive = pyregfi.openHive(hname)
     for tname in selected_tests:
         t = tests[tname]