Skip to content

Commit 911a67d

Browse files
committed
windows conditionals
1 parent 3e07863 commit 911a67d

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

ipyparallel/tests/test_shellcmd.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ def print_file(shell, filename):
167167
if platform != "posix":
168168
pytest.skip("other platform")
169169

170-
if "ssh" in sender.shell:
170+
if "ssh" in sender.shell and not sys.platform.startswith("win"):
171171
sender.shell.extend(["-i", ssh_key])
172172
# start tests
173173

ipyparallel/tests/test_ssh.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,15 @@ def ssh_config(ssh_key, request):
2929
c.Cluster.controller_ip = '0.0.0.0'
3030
c.Cluster.engine_launcher_class = request.param
3131
engine_set_cfg = c[f"{request.param}EngineSetLauncher"]
32-
engine_set_cfg.ssh_args = [
33-
"-o",
34-
"UserKnownHostsFile=/dev/null",
35-
"-o",
36-
"StrictHostKeyChecking=no",
37-
"-i",
38-
ssh_key,
39-
]
32+
if not windows:
33+
engine_set_cfg.ssh_args = [
34+
"-o",
35+
"UserKnownHostsFile=/dev/null",
36+
"-o",
37+
"StrictHostKeyChecking=no",
38+
"-i",
39+
ssh_key,
40+
]
4041
engine_set_cfg.scp_args = list(engine_set_cfg.ssh_args) # copy
4142
if windows:
4243
engine_set_cfg.remote_python = "python"

0 commit comments

Comments
 (0)