Regen CycloneDX expectation with metadata

Signed-off-by: Philippe Ombredanne <[email protected]>

Author: pombredanne

tests/formattedcode/data/cyclonedx/expected.xml

@@ -1,4 +1,15 @@
-<bom xmlns="http://cyclonedx.org/schema/bom/1.3" version="1" serialNumber="">
+<?xml version="1.0" encoding="UTF-8"?>
+<bom xmlns="http://cyclonedx.org/schema/bom/1.3" version="1" serialNumber="urn:uuid:cd08d8e2-49b8-4baa-b7b2-c96258cb3aa5">
+  <metadata>
+    <timestamp>2022-04-20T17:16:54Z</timestamp>
+    <tools>
+      <tool>
+        <vendor>AboutCode.org</vendor>
+        <name>scancode-toolkit</name>
+        <version>31.0.0b1</version>
+      </tool>
+    </tools>
+  </metadata>
   <components>
     <component type="library" bom-ref="pkg:npm/[email protected]">
       <name>npm</name>

tests/formattedcode/test_output_cyclonedx.py

@@ -64,14 +64,13 @@ def check_cyclone_xml_output(expected_file, result_file, regen=REGEN_TEST_FIXTUR
     Check that expected and result_file are equal. Ignore headers.
     If `regen` is True the expected_file is overwritten with `results_file`.
     """
-    result = load_and_clean_xml(result_file)
     if regen:
-        expected = result
-        with open(expected_file, 'w') as o:
-            o.write(result)
-    else:
-        expected = load_and_clean_xml(expected_file)
+        with open(result_file) as rf, open(expected_file, 'w') as ef:
+            expected = rf.read()
+            ef.write(expected)
 
+    result = load_and_clean_xml(result_file)
+    expected = load_and_clean_xml(expected_file)
     assert result == expected