windows conditionals

ottointhesky · Oct 28, 2024 · 911a67d · 911a67d
1 parent 3e07863
commit 911a67d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/ipyparallel/tests/test_shellcmd.py b/ipyparallel/tests/test_shellcmd.py
@@ -167,7 +167,7 @@ def print_file(shell, filename):
         if platform != "posix":
             pytest.skip("other platform")
 
-    if "ssh" in sender.shell:
+    if "ssh" in sender.shell and not sys.platform.startswith("win"):
         sender.shell.extend(["-i", ssh_key])
     # start tests
 

diff --git a/ipyparallel/tests/test_ssh.py b/ipyparallel/tests/test_ssh.py
@@ -29,14 +29,15 @@ def ssh_config(ssh_key, request):
     c.Cluster.controller_ip = '0.0.0.0'
     c.Cluster.engine_launcher_class = request.param
     engine_set_cfg = c[f"{request.param}EngineSetLauncher"]
-    engine_set_cfg.ssh_args = [
-        "-o",
-        "UserKnownHostsFile=/dev/null",
-        "-o",
-        "StrictHostKeyChecking=no",
-        "-i",
-        ssh_key,
-    ]
+    if not windows:
+        engine_set_cfg.ssh_args = [
+            "-o",
+            "UserKnownHostsFile=/dev/null",
+            "-o",
+            "StrictHostKeyChecking=no",
+            "-i",
+            ssh_key,
+        ]
     engine_set_cfg.scp_args = list(engine_set_cfg.ssh_args)  # copy
     if windows:
         engine_set_cfg.remote_python = "python"