Skip to content

Commit 46bde5f

Browse files
authored
Fix Base.show for SSHManager and LocalManager (JuliaLang/julia#34955)
1 parent 624dcdf commit 46bde5f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

src/managers.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ function launch(manager::SSHManager, params::Dict, launched::Array, launch_ntfy:
144144
end
145145

146146

147-
show(io::IO, manager::SSHManager) = println(io, "SSHManager(machines=", manager.machines, ")")
147+
Base.show(io::IO, manager::SSHManager) = print(io, "SSHManager(machines=", manager.machines, ")")
148148

149149

150150
function parse_machine(machine::AbstractString)
@@ -366,7 +366,7 @@ function addprocs(np::Integer; restrict=true, kwargs...)
366366
addprocs(LocalManager(np, restrict); kwargs...)
367367
end
368368

369-
show(io::IO, manager::LocalManager) = println(io, "LocalManager()")
369+
Base.show(io::IO, manager::LocalManager) = print(io, "LocalManager()")
370370

371371
function launch(manager::LocalManager, params::Dict, launched::Array, c::Condition)
372372
dir = params[:dir]

test/managers.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Test
22
using Distributed
33
using Sockets
4-
using Distributed: parse_machine, bind_client_port
4+
using Distributed: parse_machine, bind_client_port, SSHManager, LocalManager
55

66
@test parse_machine("127.0.0.1") == ("127.0.0.1", nothing)
77
@test parse_machine("127.0.0.1:80") == ("127.0.0.1", 80)
@@ -22,3 +22,7 @@ addr, port = getsockname(sock)
2222
sock = bind_client_port(TCPSocket(), typeof(IPv6(0)))
2323
addr, port = getsockname(sock)
2424
@test addr == ip"::"
25+
26+
@test occursin(r"^SSHManager\(machines=.*\)$",
27+
sprint((t,x) -> show(t, "text/plain", x), SSHManager("127.0.0.1")))
28+
@test sprint((t,x) -> show(t, "text/plain", x), LocalManager(1, true)) == "LocalManager()"

0 commit comments

Comments
 (0)