Fix reset_timelines!()

This was not tested, let's actually test it now and ensure it doesn't
break in the future.

Author: staticfloat

src/Universes.jl

@@ -285,7 +285,16 @@ function registry_package_lookup(f::Function, u::Universe, pkg_name::String, pkg
         pkg_uuid = only(pkg_uuids)
         pkg_subpath = joinpath(reg_inst.pkgs[pkg_uuid].path, pkg_file)
 
-        pkg_data = Pkg.Registry.parsefile(reg_inst, pkg_subpath)
+        # `parsefile()` does not gracefully deal with missing files, so we catch
+        # errors here and just skip over missing files.
+        pkg_data = try
+            Pkg.Registry.parsefile(reg_inst, pkg_subpath)
+        catch e
+            if !isa(e, SystemError)
+                rethrow(e)
+            end
+            nothing
+        end
         if pkg_data !== nothing
             f(pkg_data)
         end
@@ -406,8 +415,9 @@ Reset a universe back to its pristine state.  Removes all previous registrations
 and clears the environment of the dev'ed JLLs.
 """
 function reset_timeline!(u::Universe)
-    # Update registries to the latest
-    u.registry_instances = update_registries!(u.depot_path, u.registries)
+    # Update registries to the latest, but skip the first one since
+    # it's our local registry and it errors out if we try to update it.
+    u.registry_instances[2:end] .= update_registries!(u.registries[2:end], u.depot_path)
 
     # Clear out our local registry and recreate it
     rm(joinpath(u.depot_path, "registries", "BB2LocalRegistry"); force=true, recursive=true)

test/UniversesTests.jl

@@ -1,5 +1,5 @@
 using Test, BinaryBuilder2, Pkg, JLLGenerator, Accessors
-using BinaryBuilder2: register_jll!, get_package_versions
+using BinaryBuilder2: register_jll!, get_package_versions, reset_timeline!
 
 @testset "Universes" begin
     # Create a universe holding just `General`
@@ -39,5 +39,9 @@ using BinaryBuilder2: register_jll!, get_package_versions
 
         hwc_versions = get_package_versions(uni, "HelloWorldC2_jll")
         @test sort(hwc_versions) == [v"1.3.0", v"1.4.0"]
+
+        # Test that `reset_timeline!` eliminates our registrations:
+        reset_timeline!(uni)
+        @test isempty(get_package_versions(uni, "HelloWorldC2_jll"))
     end
 end