Add tests for SSH command/config with no user

Author: bennuttall

tests/test_pi.py

@@ -714,15 +714,18 @@ def test_pi_get_ipv4_ssh_command(pi_name, pi_info_basic, auth, pi_info_response)
     auth._api_session.get.return_value = pi_info_response
     assert pi.get_ipv4_ssh_command() == "ssh -p 5100 [email protected]"
     assert pi.get_ipv4_ssh_command(user="pi") == "ssh -p 5100 [email protected]"
+    assert pi.get_ipv4_ssh_command(user=None) == "ssh -p 5100 ssh.test-pi.hostedpi.com"
 
 
 def test_pi_get_ipv6_ssh_command(pi_name, pi_info_basic, auth, pi_info_response):
     pi = Pi(name=pi_name, info=pi_info_basic, auth=auth)
     auth._api_session.get.return_value = pi_info_response
     assert pi.get_ipv6_ssh_command() == "ssh [email protected]"
     assert pi.get_ipv6_ssh_command(user="pi") == "ssh [email protected]"
+    assert pi.get_ipv6_ssh_command(user=None) == "ssh test-pi.hostedpi.com"
     assert pi.get_ipv6_ssh_command(numeric=True) == "ssh root@[2a00:1098:8:64::1]"
     assert pi.get_ipv6_ssh_command(user="pi", numeric=True) == "ssh pi@[2a00:1098:8:64::1]"
+    assert pi.get_ipv6_ssh_command(user=None, numeric=True) == "ssh [2a00:1098:8:64::1]"
 
 
 def test_pi_get_ipv4_ssh_config(pi_name, pi_info_basic, auth, pi_info_response):
@@ -741,6 +744,12 @@ def test_pi_get_ipv4_ssh_config(pi_name, pi_info_basic, auth, pi_info_response):
     assert "port 5100" in config
     assert "hostname ssh.test-pi.hostedpi.com" in config
 
+    config = pi.get_ipv4_ssh_config(user=None)
+    assert "Host test-pi" in config
+    assert "user" not in config
+    assert "port 5100" in config
+    assert "hostname ssh.test-pi.hostedpi.com" in config
+
 
 def test_pi_get_ipv6_ssh_config(pi_name, pi_info_basic, auth, pi_info_response):
     pi = Pi(name=pi_name, info=pi_info_basic, auth=auth)
@@ -756,6 +765,11 @@ def test_pi_get_ipv6_ssh_config(pi_name, pi_info_basic, auth, pi_info_response):
     assert "user pi" in config
     assert "hostname test-pi.hostedpi.com" in config
 
+    config = pi.get_ipv6_ssh_config(user=None)
+    assert "Host test-pi" in config
+    assert "user" not in config
+    assert "hostname test-pi.hostedpi.com" in config
+
     config = pi.get_ipv6_ssh_config(numeric=True)
     assert "Host test-pi" in config
     assert "user root" in config

tests/test_picloud.py

@@ -523,8 +523,8 @@ def test_get_ipv4_ssh_config(auth, pis_response, pi_info_response, pi_info_respo
     assert auth._api_session.get.call_args_list[0][0][0] == cloud._api_url + "servers"
     assert auth._api_session.get.call_args_list[1][0][0] == cloud._api_url + "servers/pi1"
     assert auth._api_session.get.call_args_list[2][0][0] == cloud._api_url + "servers/pi2"
-    assert ipv4_config.count("\n") == 7
     lines = ipv4_config.splitlines()
+    assert len(lines) == 8
     assert lines[0] == "Host pi1"
     assert lines[1] == "    user root"
     assert lines[2] == "    port 5100"
@@ -535,6 +535,52 @@ def test_get_ipv4_ssh_config(auth, pis_response, pi_info_response, pi_info_respo
     assert lines[7] == "    hostname ssh.pi2.hostedpi.com"
 
 
+def test_get_ipv4_ssh_config_pi_user(auth, pis_response, pi_info_response, pi_info_response_2):
+    cloud = PiCloud(auth=auth)
+    auth._api_session.get.side_effect = [
+        pis_response,
+        pi_info_response,
+        pi_info_response_2,
+    ]
+    ipv4_config = cloud.get_ipv4_ssh_config(user="pi")
+    assert auth._api_session.get.call_count == 3
+    assert auth._api_session.get.call_args_list[0][0][0] == cloud._api_url + "servers"
+    assert auth._api_session.get.call_args_list[1][0][0] == cloud._api_url + "servers/pi1"
+    assert auth._api_session.get.call_args_list[2][0][0] == cloud._api_url + "servers/pi2"
+    lines = ipv4_config.splitlines()
+    assert len(lines) == 8
+    assert lines[0] == "Host pi1"
+    assert lines[1] == "    user pi"
+    assert lines[2] == "    port 5100"
+    assert lines[3] == "    hostname ssh.pi1.hostedpi.com"
+    assert lines[4] == "Host pi2"
+    assert lines[5] == "    user pi"
+    assert lines[6] == "    port 5123"
+    assert lines[7] == "    hostname ssh.pi2.hostedpi.com"
+
+
+def test_get_ipv4_ssh_config_no_user(auth, pis_response, pi_info_response, pi_info_response_2):
+    cloud = PiCloud(auth=auth)
+    auth._api_session.get.side_effect = [
+        pis_response,
+        pi_info_response,
+        pi_info_response_2,
+    ]
+    ipv4_config = cloud.get_ipv4_ssh_config(user=None)
+    assert auth._api_session.get.call_count == 3
+    assert auth._api_session.get.call_args_list[0][0][0] == cloud._api_url + "servers"
+    assert auth._api_session.get.call_args_list[1][0][0] == cloud._api_url + "servers/pi1"
+    assert auth._api_session.get.call_args_list[2][0][0] == cloud._api_url + "servers/pi2"
+    lines = ipv4_config.splitlines()
+    assert len(lines) == 6
+    assert lines[0] == "Host pi1"
+    assert lines[1] == "    port 5100"
+    assert lines[2] == "    hostname ssh.pi1.hostedpi.com"
+    assert lines[3] == "Host pi2"
+    assert lines[4] == "    port 5123"
+    assert lines[5] == "    hostname ssh.pi2.hostedpi.com"
+
+
 def test_get_ipv6_ssh_config(auth, pis_response, pi_info_response, pi_info_response_2):
     cloud = PiCloud(auth=auth)
     auth._api_session.get.side_effect = [
@@ -545,11 +591,49 @@ def test_get_ipv6_ssh_config(auth, pis_response, pi_info_response, pi_info_respo
     ipv6_config = cloud.ipv6_ssh_config
     assert auth._api_session.get.call_count == 1
     assert auth._api_session.get.call_args_list[0][0][0] == cloud._api_url + "servers"
-    assert ipv6_config.count("\n") == 5
     lines = ipv6_config.splitlines()
+    assert len(lines) == 6
     assert lines[0] == "Host pi1"
     assert lines[1] == "    user root"
     assert lines[2] == "    hostname pi1.hostedpi.com"
     assert lines[3] == "Host pi2"
     assert lines[4] == "    user root"
     assert lines[5] == "    hostname pi2.hostedpi.com"
+
+
+def test_get_ipv6_ssh_config_pi_user(auth, pis_response, pi_info_response, pi_info_response_2):
+    cloud = PiCloud(auth=auth)
+    auth._api_session.get.side_effect = [
+        pis_response,
+        pi_info_response,
+        pi_info_response_2,
+    ]
+    ipv6_config = cloud.get_ipv6_ssh_config(user="pi")
+    assert auth._api_session.get.call_count == 1
+    assert auth._api_session.get.call_args_list[0][0][0] == cloud._api_url + "servers"
+    lines = ipv6_config.splitlines()
+    assert len(lines) == 6
+    assert lines[0] == "Host pi1"
+    assert lines[1] == "    user pi"
+    assert lines[2] == "    hostname pi1.hostedpi.com"
+    assert lines[3] == "Host pi2"
+    assert lines[4] == "    user pi"
+    assert lines[5] == "    hostname pi2.hostedpi.com"
+
+
+def test_get_ipv6_ssh_config_no_user(auth, pis_response, pi_info_response, pi_info_response_2):
+    cloud = PiCloud(auth=auth)
+    auth._api_session.get.side_effect = [
+        pis_response,
+        pi_info_response,
+        pi_info_response_2,
+    ]
+    ipv6_config = cloud.get_ipv6_ssh_config(user=None)
+    assert auth._api_session.get.call_count == 1
+    assert auth._api_session.get.call_args_list[0][0][0] == cloud._api_url + "servers"
+    lines = ipv6_config.splitlines()
+    assert len(lines) == 4
+    assert lines[0] == "Host pi1"
+    assert lines[1] == "    hostname pi1.hostedpi.com"
+    assert lines[2] == "Host pi2"
+    assert lines[3] == "    hostname pi2.hostedpi.com"