Merge #458

458: Registry consistency tests: the compress roundtrip check should compare `VersionRange`s (not `String`s) r=DilumAluthge a=DilumAluthge Fixes #457 Will likely fail until JuliaRegistries/General#65997 is merged. Co-authored-by: Dilum Aluthge <[email protected]>
JuliaRegistries · Aug 14, 2022 · ceddfce · ceddfce · DilumAluthge · Aug 14, 2022
2 parents b98ce77 + 88f772c
commit ceddfce
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "RegistryCI"
 uuid = "0c95cc5f-2f7e-43fe-82dd-79dbcba86b32"
 authors = ["Dilum Aluthge <[email protected]>", "Fredrik Ekre <[email protected]>", "contributors"]
-version = "7.4.0"
+version = "7.5.0"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

diff --git a/src/registry_testing.jl b/src/registry_testing.jl
@@ -218,11 +218,16 @@ function test(path=pwd(); registry_deps::Vector{<:AbstractString}=String[])
                     end
                     # Test that the way Pkg loads this data works
                     Test.@test load_compat(compatfile, vnums)
-                    # Make sure the content roundtrips through decompression/compression
+                    # Make sure the content roundtrips through decompression/compression.
+                    # However, before we check for equality, we change the compat ranges
+                    # from `String`s to `VersionRanges`.
                     compressed = RegistryTools.Compress.compress(
                         compatfile, RegistryTools.Compress.load(compatfile)
                     )
-                    Test.@test compressed == compat
+                    mapvalues = (f, dict) -> Dict(k => f(v) for (k, v) in dict)
+                    f_inner = v -> Pkg.Types.VersionRange.(v)
+                    f_outer = dict -> mapvalues(f_inner, dict)
+                    Test.@test mapvalues(f_outer, compressed) == mapvalues(f_outer, compat)
                 end
             end
             # Make sure all paths are unique