Skip to content

Isolate threads test from parent state #4243

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 3, 2025
Merged

Isolate threads test from parent state #4243

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3a71cb6
isolate threads test from parent state
IanButterworth May 22, 2025
e378458
make test pass in the interim
IanButterworth May 22, 2025
40fb925
fix
IanButterworth May 29, 2025
e673d46
Fix test
gbaraldi Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 35 additions & 26 deletions test/new.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2111,57 +2111,66 @@ end
mktempdir() do dir
path = copy_test_package(dir, "TestThreads")
cd(path) do
with_current_env() do
default_nthreads_default = Threads.nthreads(:default)
default_nthreads_interactive = Threads.nthreads(:interactive)
other_nthreads_default = default_nthreads_default == 1 ? 2 : 1
other_nthreads_interactive = default_nthreads_interactive == 0 ? 1 : 0
@testset "default" begin
# Do this all in a subprocess to protect against the parent having non-default threadpool sizes.
script = """
using Pkg, Test
@testset "JULIA_NUM_THREADS=1" begin
withenv(
"EXPECTED_NUM_THREADS_DEFAULT" => "$default_nthreads_default",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "$default_nthreads_interactive",
"JULIA_NUM_THREADS" => nothing,
"EXPECTED_NUM_THREADS_DEFAULT" => "1",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "0", # https://github.com/JuliaLang/julia/pull/57454
"JULIA_NUM_THREADS" => "1",
) do
Pkg.test("TestThreads")
end
end
@testset "JULIA_NUM_THREADS=other_nthreads_default" begin
@testset "JULIA_NUM_THREADS=2" begin
withenv(
"EXPECTED_NUM_THREADS_DEFAULT" => "$other_nthreads_default",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "$default_nthreads_interactive",
"JULIA_NUM_THREADS" => "$other_nthreads_default",
"EXPECTED_NUM_THREADS_DEFAULT" => "2",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "1",
"JULIA_NUM_THREADS" => "2",
) do
Pkg.test("TestThreads")
end
end
@testset "JULIA_NUM_THREADS=other_nthreads_default,other_nthreads_interactive" begin
@testset "JULIA_NUM_THREADS=2,0" begin
withenv(
"EXPECTED_NUM_THREADS_DEFAULT" => "$other_nthreads_default",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "$other_nthreads_interactive",
"JULIA_NUM_THREADS" => "$other_nthreads_default,$other_nthreads_interactive",
"EXPECTED_NUM_THREADS_DEFAULT" => "2",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "0",
"JULIA_NUM_THREADS" => "2,0",
) do
Pkg.test("TestThreads")
end
end
@testset "--threads=other_nthreads_default" begin

@testset "--threads=1" begin
withenv(
"EXPECTED_NUM_THREADS_DEFAULT" => "$other_nthreads_default",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "$default_nthreads_interactive",
"EXPECTED_NUM_THREADS_DEFAULT" => "1",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "0", # https://github.com/JuliaLang/julia/pull/57454
"JULIA_NUM_THREADS" => nothing,
) do
Pkg.test("TestThreads"; julia_args=`--threads=$other_nthreads_default`)
Pkg.test("TestThreads"; julia_args=`--threads=1`)
end
end
@testset "--threads=other_nthreads_default,other_nthreads_interactive" begin
@testset "--threads=2" begin
withenv(
"EXPECTED_NUM_THREADS_DEFAULT" => "$other_nthreads_default",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "$other_nthreads_interactive",
"EXPECTED_NUM_THREADS_DEFAULT" => "2",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "1",
"JULIA_NUM_THREADS" => nothing,
) do
Pkg.test("TestThreads"; julia_args=`--threads=$other_nthreads_default,$other_nthreads_interactive`)
Pkg.test("TestThreads"; julia_args=`--threads=2`)
end
end
end
@testset "--threads=2,0" begin
withenv(
"EXPECTED_NUM_THREADS_DEFAULT" => "2",
"EXPECTED_NUM_THREADS_INTERACTIVE" => "0",
"JULIA_NUM_THREADS" => nothing,
) do
Pkg.test("TestThreads"; julia_args=`--threads=2,0`)
end
end
"""
@test Utils.show_output_if_command_errors(`$(Base.julia_cmd()) --project=$(path) --startup-file=no -e "$script"`)
end
end
end
Expand Down
7 changes: 6 additions & 1 deletion test/test_packages/TestThreads/test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ EXPECTED_NUM_THREADS_DEFAULT = parse(Int, ENV["EXPECTED_NUM_THREADS_DEFAULT"])
EXPECTED_NUM_THREADS_INTERACTIVE = parse(Int, ENV["EXPECTED_NUM_THREADS_INTERACTIVE"])
@assert Threads.nthreads() == EXPECTED_NUM_THREADS_DEFAULT
@assert Threads.nthreads(:default) == EXPECTED_NUM_THREADS_DEFAULT
@assert Threads.nthreads(:interactive) == EXPECTED_NUM_THREADS_INTERACTIVE
if Threads.nthreads() == 1
@info "Convert me back to an assert once https://github.com/JuliaLang/julia/pull/57454 has landed" Threads.nthreads(:interactive) EXPECTED_NUM_THREADS_INTERACTIVE
else
@assert Threads.nthreads(:interactive) == EXPECTED_NUM_THREADS_INTERACTIVE
end

2 changes: 1 addition & 1 deletion test/utils.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ function show_output_if_command_errors(cmd::Cmd)
println(read(out, String))
Base.pipeline_error(proc)
end
return nothing
return true
end

function recursive_rm_cov_files(rootdir::String)
Expand Down