Skip to content

Commit eaca4a8

Browse files
IanButterworthKristofferC
authored andcommitted
make some test_logs match any because of new Downloads debugs (#4007)
(cherry picked from commit 43e7849)
1 parent 1fc840e commit eaca4a8

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

test/new.jl

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -716,6 +716,7 @@ end
716716
(:debug, "tiered_resolve: trying PRESERVE_ALL_INSTALLED"),
717717
(:debug, "tiered_resolve: trying PRESERVE_ALL"),
718718
min_level=Logging.Debug,
719+
match_mode=:any,
719720
Pkg.add(Pkg.PackageSpec(;name="JSON", version="0.18.0"); preserve=Pkg.PRESERVE_TIERED_INSTALLED)
720721
)
721722
@test Pkg.dependencies()[exuuid].version == v"0.3.0"
@@ -726,18 +727,29 @@ end
726727
@test_logs(
727728
(:debug, "tiered_resolve: trying PRESERVE_ALL_INSTALLED"),
728729
min_level=Logging.Debug,
730+
match_mode=:any,
729731
Pkg.add("Example"; preserve=Pkg.PRESERVE_TIERED_INSTALLED) # should only add v0.3.0 as it was installed earlier
730732
)
731733
@test Pkg.dependencies()[exuuid].version == v"0.3.0"
732734

733735
withenv("JULIA_PKG_PRESERVE_TIERED_INSTALLED" => true) do
734736
Pkg.activate(temp=true)
735-
@test_logs (:debug, "tiered_resolve: trying PRESERVE_ALL_INSTALLED") min_level=Logging.Debug Pkg.add(name="Example")
737+
@test_logs(
738+
(:debug, "tiered_resolve: trying PRESERVE_ALL_INSTALLED"),
739+
min_level=Logging.Debug,
740+
match_mode=:any,
741+
Pkg.add(name="Example")
742+
)
736743
@test Pkg.dependencies()[exuuid].version == v"0.3.0"
737744
end
738745

739746
Pkg.activate(temp=true)
740-
@test_logs (:debug, "tiered_resolve: trying PRESERVE_ALL") min_level=Logging.Debug Pkg.add(name="Example") # default 'add' should serve a newer version
747+
@test_logs(
748+
(:debug, "tiered_resolve: trying PRESERVE_ALL"),
749+
min_level=Logging.Debug,
750+
match_mode=:any,
751+
Pkg.add(name="Example") # default 'add' should serve a newer version
752+
)
741753
@test Pkg.dependencies()[exuuid].version > v"0.3.0"
742754
end
743755
# - `tiered` is the default option.

0 commit comments

Comments
 (0)