diff --git a/test/downstream.jl b/test/downstream.jl index c5ac968..702eaf1 100644 --- a/test/downstream.jl +++ b/test/downstream.jl @@ -24,7 +24,6 @@ failsafe_clone_checkout(path, url) = begin if !isfile(versions) mkpath(general) run(setenv(`tar xf $general.tar.gz`; dir = general)) - readdir(general) |> println end @assert isfile(versions) @@ -48,7 +47,7 @@ fake_supported_version!(path) = begin nothing end -deploy_Plots() = begin +develop_stable_Plots() = begin tmpd = mktempdir() Plots_jl = joinpath(tmpd, "Plots.jl") @@ -60,7 +59,7 @@ deploy_Plots() = begin nothing end -deploy_Makie(extended = false) = begin +develop_stable_Makie(extended = false) = begin tmpd = mktempdir() Makie_jl = joinpath(tmpd, "Makie.jl") @@ -78,21 +77,23 @@ deploy_Makie(extended = false) = begin nothing end -deploy_Plots() +develop_stable_Plots() using Plots @testset "downstream Plots" begin # test basic plots creation & display (Plots tests are too long to run) - true && @time for i ∈ 1:length(Plots._examples) - i ∈ Plots._backend_skips[:gr] && continue # skip unsupported examples - Plots._examples[i].imports ≡ nothing || continue # skip examples requiring optional test deps - show(devnull, Plots.test_examples(:gr, i; disp = false)) # trigger display logic + withenv("GKSwstype" => "nul") do + @time for i ∈ 1:length(Plots._examples) + i ∈ Plots._backend_skips[:gr] && continue # skip unsupported examples + Plots._examples[i].imports ≡ nothing || continue # skip examples requiring optional test deps + show(devnull, Plots.test_examples(:gr, i; disp = false)) # trigger display logic + end end end extended = tryparse(Bool, get(ENV, "CI", "false")) === true # extended test in CI -deploy_Makie(extended) +develop_stable_Makie(extended) @testset "downstream Makie" begin Pkg.test("Makie") extended && Pkg.test("CairoMakie") diff --git a/test/runtests.jl b/test/runtests.jl index 0fd8d62..551d822 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -225,7 +225,9 @@ end end @testset "PlotUtils.jl/issues/155" begin - palette(:tab10, 1) + for n ∈ 1:10 + @test length(palette(:tab10, n)) == n + end end @testset "PlotUtils.jl/issues/156" begin @@ -303,12 +305,9 @@ end @test stats.time < 1e-3 # ~ 0.22ms (on 1.9) end -if Sys.islinux() && VERSION ≥ v"1.9.0" +if Sys.islinux() && VERSION ≥ v"1.9.0" && isempty(VERSION.prerelease) # avoid running on `nightly` @testset "downstream" begin - withenv("GKSwstype" => "nul") do - include("downstream.jl") - end - @test true + include("downstream.jl") end @testset "adaptive" begin # NOTE: must be ran after downstream test (for Plots) withenv("GKSwstype" => "nul") do