Skip to content

Commit 7eefb6b

Browse files
committed
fixup! Use LibSSH.jl to set up an SSH server for the SSHManager tests
1 parent a05a4c5 commit 7eefb6b

File tree

2 files changed

+15
-10
lines changed

2 files changed

+15
-10
lines changed

.github/workflows/ci.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,15 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
version:
26-
- 'nightly'
26+
# - 'nightly'
2727
- '1'
2828
os:
2929
- ubuntu-latest
30-
- macOS-latest
31-
- windows-latest
30+
# - macOS-latest
31+
# - windows-latest
3232
arch:
3333
- x64
34-
- x86
34+
# - x86
3535
exclude:
3636
- os: macOS-latest
3737
arch: x86

test/distributed_exec.jl

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -807,6 +807,12 @@ if Sys.isunix() # aka have ssh
807807
append!(hosts, localhost_aliases)
808808
end
809809

810+
# CI machines sometimes don't already have a .ssh directory
811+
ssh_dir = joinpath(homedir(), ".ssh")
812+
if !isdir(ssh_dir)
813+
mkdir(ssh_dir)
814+
end
815+
810816
print("\nTesting SSH addprocs with $(length(hosts)) workers...\n")
811817
new_pids = addprocs_with_testenv(hosts; sshflags=sshflags)
812818
@test length(new_pids) == length(hosts)
@@ -828,14 +834,13 @@ if Sys.isunix() # aka have ssh
828834
test_n_remove_pids(new_pids)
829835

830836
print("\nssh addprocs with tunnel (SSH multiplexing)\n")
837+
838+
controlpath = joinpath(ssh_dir, "julia-$(ENV["USER"])@localhost:2222")
831839
new_pids = addprocs_with_testenv([("localhost", num_workers)]; tunnel=true, multiplex=true, sshflags=sshflags)
832840
@test length(new_pids) == num_workers
833-
mktempdir() do path
834-
controlpath = joinpath(path, "julia-$(ENV["USER"])@localhost:2222")
835-
@test issocket(controlpath)
836-
test_n_remove_pids(new_pids)
837-
@test :ok == timedwait(()->!issocket(controlpath), 10.0; pollint=0.5)
838-
end
841+
@test issocket(controlpath)
842+
test_n_remove_pids(new_pids)
843+
@test :ok == timedwait(()->!issocket(controlpath), 10.0; pollint=0.5)
839844

840845
print("\nAll supported formats for hostname\n")
841846
h1 = "localhost"

0 commit comments

Comments
 (0)