Skip to content

Commit

Permalink
Test ambiguities in package extension
Browse files Browse the repository at this point in the history
  • Loading branch information
lgoettgens committed Jul 18, 2023
1 parent 067e6ac commit 0496961
Show file tree
Hide file tree
Showing 2 changed files with 89 additions and 9 deletions.
81 changes: 72 additions & 9 deletions src/ambiguities.jl
Original file line number Diff line number Diff line change
Expand Up @@ -84,27 +84,87 @@ function reprexclude(exspecs::Vector{ExcludeSpec})
return string("Aqua.ExcludeSpec[", join(itemreprs, ", "), "]")
end

function _test_ambiguities(packages::Vector{PkgId}; broken::Bool = false, kwargs...)
num_ambiguities, strout, strerr = _find_ambiguities(packages; kwargs...)
function _test_ambiguities(
packages::Vector{PkgId};
broken::Bool = false,
extension_combinations = :default,
kwargs...,
)
if extension_combinations == :default
extension_combinations = Vector{String}[]
push!(extension_combinations, String[])
@static if JULIA_HAS_EXTENSIONS

Check warning on line 96 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L96

Added line #L96 was not covered by tests
all_exts = String[]
for pkg in setdiff(packages, [PkgId(Base), PkgId(Core)])
exts, _, _ = get_extension_data_from_toml(pkg)
for e in keys(exts)
push!(extension_combinations, [e])
end

Check warning on line 102 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L101-L102

Added lines #L101 - L102 were not covered by tests
push!(extension_combinations, collect(keys(exts)))
append!(all_exts, collect(keys(exts)))
end
push!(extension_combinations, all_exts)
end
unique!(extension_combinations)
end
for extensions in extension_combinations
@info "Testing ambiguities with extensions: $extensions"
num_ambiguities, strout, strerr =
_find_ambiguities(packages; extensions = extensions, kwargs...)

print(stderr, strerr)
print(stdout, strout)
print(stderr, strerr)
print(stdout, strout)

if broken
@test_broken num_ambiguities == 0
else
@test num_ambiguities == 0
if broken
@test_broken num_ambiguities == 0

Check warning on line 119 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L119

Added line #L119 was not covered by tests
else
@test num_ambiguities == 0
end
end

end

function _find_ambiguities(
packages::Vector{PkgId};
color::Union{Bool,Nothing} = nothing,
exclude::AbstractVector = [],
extensions::AbstractVector = [],
# Options to be passed to `Test.detect_ambiguities`:
detect_ambiguities_options...,
)
packages = copy(packages)
extdeppackages = PkgId[]
@static if JULIA_HAS_EXTENSIONS

Check warning on line 137 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L137

Added line #L137 was not covered by tests
extensions = String.(extensions)
for ext in extensions
found = false
for pkg in setdiff(packages, [PkgId(Base), PkgId(Core)])
exts, weakdeps, deps = get_extension_data_from_toml(pkg)
if haskey(exts, ext)
found = true
extdeps = exts[ext] isa String ? [exts[ext]] : exts[ext]
for extdepname in extdeps
if haskey(deps, extdepname)
push!(extdeppackages, deps[extdepname])
elseif haskey(weakdeps, extdepname)
push!(extdeppackages, weakdeps[extdepname])

Check warning on line 150 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L140-L150

Added lines #L140 - L150 were not covered by tests
else
error(

Check warning on line 152 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L152

Added line #L152 was not covered by tests
"Extension $ext depends on $extdepname, but it is not found.",
)
end
end
push!(packages, PkgId(Base.uuid5(pkg.uuid, ext), ext))
break

Check warning on line 158 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L156-L158

Added lines #L156 - L158 were not covered by tests
end
end
found && continue
error("Extension $ext is not found.")
end

Check warning on line 163 in src/ambiguities.jl

View check run for this annotation

Codecov / codecov/patch

src/ambiguities.jl#L160-L163

Added lines #L160 - L163 were not covered by tests
end

packages_repr = reprpkgids(collect(packages))
extdeppackages_repr = reprpkgids(collect(extdeppackages))
options_repr = checked_repr((; recursive = true, detect_ambiguities_options...))
exclude_repr = reprexclude(normalize_and_check_exclude(exclude))

Expand All @@ -115,6 +175,7 @@ function _find_ambiguities(
using Aqua
Aqua.test_ambiguities_impl(
$packages_repr,
$extdeppackages_repr,
$options_repr,
$exclude_repr,
) || exit(1)
Expand Down Expand Up @@ -143,7 +204,7 @@ end

function reprpkgids(packages::Vector{PkgId})
packages_repr = sprint() do io
println(io, '[')
println(io, "Base.PkgId[")
for pkg in packages
println(io, reprpkgid(pkg))
end
Expand Down Expand Up @@ -200,9 +261,11 @@ end

function test_ambiguities_impl(
packages::Vector{PkgId},
extdeppackages::Vector{PkgId},
options::NamedTuple,
exspecs::Vector{ExcludeSpec},
)
deps = map(Base.require, extdeppackages)
modules = map(Base.require, packages)
@debug "Testing method ambiguities" modules
ambiguities = detect_ambiguities(modules...; options...)
Expand Down
17 changes: 17 additions & 0 deletions src/utils.jl
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,23 @@ catch
end
end

function get_extension_data_from_toml(pkg::PkgId)
root_project_path = root_project_or_failed_lazytest(pkg)
root_project_path isa LazyTestResult &&
return Dict{String,Any}(), Dict{String,Any}(), Dict{String,Any}()

@debug "Parsing `$root_project_path`"
prj = TOML.parsefile(root_project_path)
raw_exts = get(prj, "extensions", Dict{String,Any}())

raw_weakdeps = get(prj, "weakdeps", Dict{String,Any}())
weakdeps = Dict(name => PkgId(UUID(uuid), name) for (name, uuid) in raw_weakdeps)

raw_deps = get(prj, "deps", Dict{String,Any}())
deps = Dict(name => PkgId(UUID(uuid), name) for (name, uuid) in raw_deps)
return raw_exts, weakdeps, deps
end

const _project_key_order = [
"name",
"uuid",
Expand Down

0 comments on commit 0496961

Please sign in to comment.