Merge pull request #374 from dls-controls/fix/hdf5-xml-layout

HDF5WriterPart: remove auto_ndattr_default as invalid xml for schema
DiamondLightSource · May 26, 2022 · b989233 · b989233
2 parents 95706b0 + 97060e5
commit b989233
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/malcolm/modules/ADCore/parts/hdfwriterpart.py b/malcolm/modules/ADCore/parts/hdfwriterpart.py
@@ -242,7 +242,7 @@ def make_layout_xml(
     write_all_nd_attributes: bool = False,
 ) -> str:
     # Make a root element with an NXEntry
-    root_el = ET.Element("hdf5_layout", auto_ndattr_default="false")
+    root_el = ET.Element("hdf5_layout")
     entry_el = ET.SubElement(root_el, "group", name="entry")
     ET.SubElement(
         entry_el,

diff --git a/tests/test_modules/test_ADCore/test_hdfwriterpart.py b/tests/test_modules/test_ADCore/test_hdfwriterpart.py
@@ -24,7 +24,7 @@
 
 expected_xml = (
     '<?xml version="1.0" ?>\n'
-    '<hdf5_layout auto_ndattr_default="false">\n'
+    "<hdf5_layout>\n"
     '<group name="entry">\n'
     '<attribute name="NX_class" source="constant" type="string" value="NXentry" />\n'
     '<group name="detector">\n'
@@ -343,6 +343,7 @@ def test_configure(self):
         self.mock_xml_is_valid_check(self.o)
         self.context.set_notify_dispatch_request(self.o.notify_dispatch_request)
         actual_xml = self.configure_and_check_output()
+        assert actual_xml == expected_xml
 
         actual_tree = ElementTree.XML(actual_xml)
         expected_tree = ElementTree.XML(expected_xml)
@@ -367,6 +368,7 @@ def test_configure_windows(self):
         self.mock_xml_is_valid_check(self.o)
         self.context.set_notify_dispatch_request(self.o.notify_dispatch_request)
         actual_xml = self.configure_and_check_output(on_windows=True)
+        assert actual_xml == expected_xml
 
         actual_tree = ElementTree.XML(actual_xml)
         expected_tree = ElementTree.XML(expected_xml)