Changeset 1171 for trunk/bindings/python/nxstest.py

Timestamp:

16/01/09 23:26:16 (3 years ago)

Author:

Paul Kienzle

Message:

xml getattrinfo now returns correct number of attrs for root; nxstest now skips bogus CDF0.0 entry in HDF4 root; nxs/napi.py now reimplements openpath so that nexus file knows its current path. Refs #149.

File:

• trunk/bindings/python/nxstest.py (modified) (3 diffs)

trunk/bindings/python/nxstest.py

@@ -45 +45 @@
         print "%(prefix)s@%(attr)s: %(value)s" % locals()
     for name,nxclass in file.entries():
+        if nxclass.startswith("CDF"): continue # Root has an extra CDF class
         if nxclass == "SDS":
             shape,dtype = file.getinfo()
@@ -189 +190 @@
     file = nxs.open(filename,'rw')
     if filename != file.inquirefile(): fail("Files don't match")
-    attrs = file.getattrinfo()
-    if attrs != 4: fail("Expected 4 root attributes but got %d", attrs)
-    for i in range(attrs):
+
+    # check headers
+    num_attrs = file.getattrinfo()
+    wxattrs = ['xmlns','xmlns:xsi','xsi:schemaLocation', 'XML_version']
+    w4attrs = ['HDF_version']
+    w5attrs = ['HDF5_Version']
+    extras = dict(wx=wxattrs,w4=w4attrs,w5=w5attrs)
+    expected_attrs = ['NeXus_version','file_name','file_time']+extras[mode]
+    for i in range(num_attrs):
         name,dims,type = file.getnextattr()
-        if name not in ['file_time','HDF_version','HDF5_Version','XML_version',
-                        'NeXus_version','file_name']:
+        if name not in expected_attrs:
             fail("attribute %s unexpected"%(name))
+    if num_attrs != len(expected_attrs): 
+        fail("Expected %d root attributes but got %d"
+             % (len(expected_attrs),num_attrs))
     
     file.opengroup('entry','NXentry')
@@ -230 +239 @@
     if not get == numpy.int32(42): fail("i4_attribute retrieved %s"%(get))
     get = file.getattr("r4_attribute",1,'float32')
-    if not get == numpy.float32(3.14159265): fail("r4_attribute retrieved %s"%(get))
+    if ((mode=='wx' and not abs(get-3.14159265) < 1e-6) or
+        (mode!='wx' and not get == numpy.float32(3.14159265))):
+        fail("r4_attribute retrieved %s"%(get))
     ## Oops... NAPI doesn't support array attributes
     #expect = numpy.array([3,2],dtype='int32')