Fix other broken test

Signed-off-by: Fabrice Normandin <[email protected]>

Author: lebrice

tests/cli/test_init_command.py

@@ -892,6 +892,18 @@ def test_setup_windows_ssh_config_from_wsl_copies_keys(
     monkeypatch: pytest.MonkeyPatch,
     input_stream: io.StringIO,
 ):
+    # The references to the linux SSH keys in "home" need to be adjusted to point to the
+    # home during testing.
+    # This way, we can check that running the function will correctly change the
+    # identityfile from linux to windows home.
+    linux_ssh_config.path.write_text(
+        linux_ssh_config.path.read_text()
+        .replace("~", str(linux_home))
+        # Real home directory:
+        .replace(os.environ["HOME"], str(linux_home))
+    )
+    linux_ssh_config = SSHConfig(linux_ssh_config.path)
+
     linux_public_key_path, linux_private_key_path = fake_linux_ssh_keypair
     prompt_inputs = [
         "y",  # accept creating the Windows config file

tests/cli/test_init_command/test_setup_windows_ssh_config_from_wsl_reject_.md

@@ -8,7 +8,7 @@ Host mila
   ServerAliveInterval 120
   ServerAliveCountMax 5
   User bob
-  IdentityFile ~/.ssh/id_rsa_mila
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_mila
 
 Host mila-cpu
   Port 2222
@@ -22,70 +22,70 @@ Host mila-cpu
   ProxyCommand ssh mila "/cvmfs/config.mila.quebec/scripts/milatools/slurm-proxy.sh mila-cpu --mem=8G"
   RemoteCommand /cvmfs/config.mila.quebec/scripts/milatools/entrypoint.sh mila-cpu
   User bob
-  IdentityFile ~/.ssh/id_rsa_mila
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_mila
 
 Host *.server.mila.quebec !*login.server.mila.quebec
   ProxyJump mila
   User bob
-  IdentityFile ~/.ssh/id_rsa_mila
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_mila
 
 Host cn-????
   ProxyJump mila
   User bob
-  IdentityFile ~/.ssh/id_rsa_mila
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_mila
 
 Host narval rorqual fir nibi trillium trillium-gpu tamia killarney vulcan
   HostName %h.alliancecan.ca
   ControlMaster auto
-  ControlPath ~/.cache/ssh/%r@%h:%p
+  ControlPath <WSL_HOME>/.cache/ssh/%r@%h:%p
   ControlPersist yes
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host nc????? ng?????
   ProxyJump narval
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host rc????? rg????? rl?????
   ProxyJump rorqual
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host fc????? fb?????
   ProxyJump fir
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host c? c?? c??? g? g?? l? l?? m? m?? u?
   ProxyJump nibi
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host tg????? tc?????
   ProxyJump tamia
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host kn???
   ProxyJump killarney
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host rack??-??
   ProxyJump vulcan
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host !trillium tri????
   ProxyJump trillium
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 
 Host !trillium trig????
   ProxyJump trillium-gpu
   User bob
-  IdentityFile ~/.ssh/id_rsa_drac
+  IdentityFile <WSL_HOME>/.ssh/id_rsa_drac
 ```