Skip to content

Commit

Permalink
Merge pull request #93 from JuliaLang/ib/guard_rmprocs
Browse files Browse the repository at this point in the history
Guard rmprocs in tests to avoid warning. Fix leaky stderr from SIGTERM test.
  • Loading branch information
vtjnash authored Feb 26, 2024
2 parents 8c03305 + 41cd14f commit 6a07d98
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 4 additions & 2 deletions test/distributed_exec.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1906,7 +1906,7 @@ end end
include("splitrange.jl")

# Clear all workers for timeout tests (issue #45785)
rmprocs(workers())
nprocs() > 1 && rmprocs(workers())
begin
# First, assert that we get no messages when we close a cooperative worker
w = only(addprocs(1))
Expand All @@ -1920,12 +1920,14 @@ begin
remote_do(w) do
# Cause the 'exit()' message that `rmprocs()` sends to do nothing
Core.eval(Base, :(exit() = nothing))
# Hide the trace that `rmprocs()` will cause this worker to show
redirect_stderr(devnull)
end
wait(rmprocs([w]))
end
end

# Run topology tests last after removing all workers, since a given
# cluster at any time only supports a single topology.
rmprocs(workers())
nprocs() > 1 && rmprocs(workers())
include("topology.jl")
2 changes: 1 addition & 1 deletion test/topology.jl
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ for (i, (from,to)) in enumerate(combinations)
end

# With lazy=false, all connections ought to be setup during `addprocs`
rmprocs(workers())
nprocs() > 1 && rmprocs(workers())
addprocs_with_testenv(8; lazy=false)
def_count_conn()
@test sum(asyncmap(p->remotecall_fetch(count_connected_workers,p), workers())) == 64
Expand Down

0 comments on commit 6a07d98

Please sign in to comment.