Message ID | 161373266228.1608713.7614311331725780044.stgit@pasha-ThinkPad-X280 |
---|---|
State | New |
Headers | show |
Series | tests/acceptance: linux-related tests fix | expand |
On Fri, Feb 19, 2021 at 8:07 AM Pavel Dovgalyuk <pavel.dovgalyuk@ispras.ru> wrote: > > This patch allows cloudinit images download when ssh > key is not specified. > > Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> > --- > tests/acceptance/avocado_qemu/__init__.py | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > Reviewed-by: Willian Rampazzo <willianr@redhat.com>
diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/avocado_qemu/__init__.py index df167b142c..4ac9f72876 100644 --- a/tests/acceptance/avocado_qemu/__init__.py +++ b/tests/acceptance/avocado_qemu/__init__.py @@ -304,8 +304,10 @@ def prepare_cloudinit(self, ssh_pubkey=None): try: cloudinit_iso = os.path.join(self.workdir, 'cloudinit.iso') self.phone_home_port = network.find_free_port() - with open(ssh_pubkey) as pubkey: - pubkey_content = pubkey.read() + pubkey_content = None + if ssh_pubkey: + with open(ssh_pubkey) as pubkey: + pubkey_content = pubkey.read() cloudinit.iso(cloudinit_iso, self.name, username='root', password='password',
This patch allows cloudinit images download when ssh key is not specified. Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgalyuk@ispras.ru> --- tests/acceptance/avocado_qemu/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)