Add tests to verify our version updates are working

Author: dwoz

relenv/build/darwin.py

@@ -8,11 +8,9 @@
 
 import glob
 import io
-import os
 import pathlib
 import shutil
 import tarfile
-import time
 import urllib.request
 from typing import IO, MutableMapping
 
@@ -24,7 +22,6 @@
     builds,
     finalize,
     get_dependency_version,
-    update_sbom_checksums,
 )
 
 ARCHES = arches[DARWIN]
@@ -98,11 +95,16 @@ def update_expat(dirs: Dirs, env: MutableMapping[str, str]) -> None:
 
     # Touch all updated files to ensure make rebuilds them
     # (The tarball may contain files with newer timestamps)
+    import time
+    import os
+
     now = time.time()
     for target_file in updated_files:
         os.utime(target_file, (now, now))
 
     # Update SBOM with correct checksums for updated expat files
+    from relenv.build.common import update_sbom_checksums
+
     files_to_update = {}
     for target_file in updated_files:
         # SBOM uses relative paths from Python source root

relenv/build/linux.py

@@ -13,7 +13,6 @@
 import shutil
 import tarfile
 import tempfile
-import time
 import urllib.request
 from typing import IO, MutableMapping
 
@@ -25,7 +24,6 @@
     builds,
     finalize,
     get_dependency_version,
-    update_sbom_checksums,
 )
 from ..common import LINUX, Version, arches, runcmd
 
@@ -410,11 +408,15 @@ def update_expat(dirs: Dirs, env: EnvMapping) -> None:
 
     # Touch all updated files to ensure make rebuilds them
     # (The tarball may contain files with newer timestamps)
+    import time
+
     now = time.time()
     for target_file in updated_files:
         os.utime(target_file, (now, now))
 
     # Update SBOM with correct checksums for updated expat files
+    from relenv.build.common import update_sbom_checksums
+
     files_to_update = {}
     for target_file in updated_files:
         # SBOM uses relative paths from Python source root

relenv/build/windows.py

@@ -14,7 +14,6 @@
 import shutil
 import sys
 import tarfile
-import time
 from typing import IO, MutableMapping, Union
 
 from .common import (
@@ -25,7 +24,6 @@
     install_runtime,
     patch_file,
     update_ensurepip,
-    update_sbom_checksums,
 )
 from ..common import (
     WIN32,
@@ -261,11 +259,17 @@ def update_expat(dirs: Dirs, env: EnvMapping) -> None:
 
     # Touch all updated files to ensure MSBuild rebuilds them
     # (The original files may have newer timestamps)
+    import time
+
     now = time.time()
     for target_file in updated_files:
         os.utime(target_file, (now, now))
 
     # Map SBOM file names to actual file paths
+    # Update SBOM with correct checksums for updated expat files
+    # Map SBOM file names to actual file paths
+    from relenv.build.common import update_sbom_checksums
+
     files_to_update = {}
     for target_file in updated_files:
         # SBOM uses relative paths from Python source root

tests/test_verify_build.py

@@ -2142,10 +2142,9 @@ def test_expat_version(pyexec):
     # Convert "expat_2_7_3" -> "2.7.3"
     actual_version = actual_version_str.replace("expat_", "").replace("_", ".")
 
-    assert actual_version == expected_version, (
-        f"Expat version mismatch on {platform}: expected {expected_version}, "
-        f"found {actual_version} (from {actual_version_str})"
-    )
+    assert (
+        actual_version == expected_version
+    ), f"Expat version mismatch on {platform}: expected {expected_version}, "
 
 
 def test_sqlite_version(pyexec):
@@ -2245,10 +2244,9 @@ def test_openssl_version(pyexec):
 
     actual_version = match.group(1)
 
-    assert actual_version == expected_version, (
-        f"OpenSSL version mismatch on {platform}: expected {expected_version}, "
-        f"found {actual_version} (from {actual_version_str})"
-    )
+    assert (
+        actual_version == expected_version
+    ), f"found {actual_version} (from {actual_version_str})"
 
 
 def test_xz_lzma_functionality(pyexec):