qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH 2/3] virtiofs_submounts.py: Do not generate ssh key


From: Max Reitz
Subject: [PATCH 2/3] virtiofs_submounts.py: Do not generate ssh key
Date: Wed, 12 May 2021 14:55:43 +0200

Since c0c5a7f18e623b8f6eb, avocado_qemu provides an ssh key by default.
There is no need to generate one in the virtiofs_submounts test.
(In fact, it currently is harmful, because e8197c6e0c56aff83 made
LinuxTest expect ssh_pubkey to be a file path and not the file content,
but virtiofs_submounts provides the latter.)

Signed-off-by: Max Reitz <mreitz@redhat.com>
---
 tests/acceptance/virtiofs_submounts.py | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/tests/acceptance/virtiofs_submounts.py 
b/tests/acceptance/virtiofs_submounts.py
index 46fa65392a..22fe14b661 100644
--- a/tests/acceptance/virtiofs_submounts.py
+++ b/tests/acceptance/virtiofs_submounts.py
@@ -220,7 +220,7 @@ def live_cleanup(self):
         self.run(('bash', self.get_data('cleanup.sh'), scratch_dir))
 
     @skipUnless(*has_cmds(('sudo -n', ('sudo', '-n', 'true')),
-                          'ssh-keygen', 'bash', 'losetup', 'mkfs.xfs', 
'mount'))
+                          'bash', 'losetup', 'mkfs.xfs', 'mount'))
     def setUp(self):
         vmlinuz = self.params.get('vmlinuz')
         if vmlinuz is None:
@@ -242,13 +242,7 @@ def setUp(self):
 
         self.seed = self.params.get('seed')
 
-        self.ssh_key = os.path.join(self.workdir, 'id_ed25519')
-
-        self.run(('ssh-keygen', '-N', '', '-t', 'ed25519', '-f', self.ssh_key))
-
-        pubkey = open(self.ssh_key + '.pub').read()
-
-        super(VirtiofsSubmountsTest, self).setUp(pubkey)
+        super(VirtiofsSubmountsTest, self).setUp()
 
         if len(vmlinuz) > 0:
             self.vm.add_args('-kernel', vmlinuz,
-- 
2.31.1




reply via email to

[Prev in Thread] Current Thread [Next in Thread]