Merge ~bjornt/maas:bug-2053033-failed-login-virsh into maas:master

[Björn Tillenius]

Bug #2053033: Creating MAAS Virsh VM does not work (libvirt: error)

For some reason virsh prints out an error about executing
pkttyagent. This happens only on some machines, and we don't know why.

But the error seems harmless. This patch ignores the error and
lets the connection succeed.

[Adam Collard (adam-collard)]

Nice find, +1

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b bug-2053033-failed-login-virsh lp:~bjornt/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 38785a9d631fd9d8d71101f8614717d395491207

review: Approve

diff --git a/src/provisioningserver/drivers/pod/tests/test_virsh.py b/src/provisioningserver/drivers/pod/tests/test_virsh.py
index 89e5f6d..479804f 100644
--- a/src/provisioningserver/drivers/pod/tests/test_virsh.py
+++ b/src/provisioningserver/drivers/pod/tests/test_virsh.py
@@ -572,7 +572,30 @@ class TestVirshSSH(MAASTestCase):
         self.assertFalse(conn.login(poweraddr=factory.make_name("poweraddr")))
         mock_close.assert_called_once_with()
 
+    def test_pkttyagent_permission_denied(self):
+        # Sometimes pkttyagent can't be executed in the snap. The connection
+        # itself still works, though.
+        # See https://bugs.launchpad.net/maas/+bug/2053033
+        virsh_outputs = [
+            "libvirt:  error : cannot execute binary /usr/bin/pkttyagent: Permission denied",
+            "Welcome to virsh, the virtualization interactive terminal.",
+            "",
+            "Type:  'help' for help with commands",
+            "       'quit' to quit",
+            "",
+            "virsh # ",
+        ]
+        conn = self.configure_virshssh_pexpect(virsh_outputs)
+        self.assertTrue(conn.login(poweraddr=factory.make_name("poweraddr")))
+
     def test_login_invalid(self):
+        virsh_outputs = ["Permission denied, please try again."]
+        conn = self.configure_virshssh_pexpect(virsh_outputs)
+        mock_close = self.patch(conn, "close")
+        self.assertFalse(conn.login(poweraddr=factory.make_name("poweraddr")))
+        mock_close.assert_called_once_with()
+
+    def test_unknown(self):
         virsh_outputs = [factory.make_string()]
         conn = self.configure_virshssh_pexpect(virsh_outputs)
         mock_close = self.patch(conn, "close")
diff --git a/src/provisioningserver/drivers/pod/virsh.py b/src/provisioningserver/drivers/pod/virsh.py
index fb2bff3..f357205 100644
--- a/src/provisioningserver/drivers/pod/virsh.py
+++ b/src/provisioningserver/drivers/pod/virsh.py
@@ -286,7 +286,8 @@ class VirshSSH(pexpect.spawn):
     PROMPT = r"virsh \#"
     PROMPT_SSHKEY = "(?i)are you sure you want to continue connecting"
     PROMPT_PASSWORD = "(?i)(?:password)|(?:passphrase for key)"
-    PROMPT_DENIED = "(?i)permission denied"
+    # Credential problems
+    PROMPT_DENIED = "(?i)permission denied, please try again"
     PROMPT_CLOSED = "(?i)connection closed by remote host"
 
     PROMPTS = [