From nobody Mon May 13 07:50:30 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=ispras.ru ARC-Seal: i=1; a=rsa-sha256; t=1613732778; cv=none; d=zohomail.com; s=zohoarc; b=ifsh+p/HYv5JO0KWKdt7j7IkYG/WY283p93vggbT+Fssv2B3kAMq8zDSTEp9qg1vgnbTzOnpyf1xy7XFn5inp3Bl5rsCdyqc/XzrLphrF4PhWrSUcJgFBk/bUsRgd2sb1bWh3l4erN1c5qL2VATCzTGDzcWQaTWI0j5MDqwlhzw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613732778; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=rVPBi4VU9pSwkY3wgebZ13873+2x++CoUtoHgfKoDI4=; b=D2sG7T06NJhCLJ7d9bR2ogLwV1z2ecjvQnFvqXCnzJ0kd0uCPgBvOULvXqvI7HM964NK/OufSn8AFRqMdF/QK/nEz5hkBmYAuQpDMy0tKj6Komj87DYcwZ+swYozF575UvNXuLWO8J91IhCtKBY40ANc4CwZnXkXsRmlflY6AFY= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1613732778217148.74764024631736; Fri, 19 Feb 2021 03:06:18 -0800 (PST) Received: from localhost ([::1]:59780 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lD3c0-00030f-QU for importer@patchew.org; Fri, 19 Feb 2021 06:06:16 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD3aN-0002R3-7g for qemu-devel@nongnu.org; Fri, 19 Feb 2021 06:04:36 -0500 Received: from mail.ispras.ru ([83.149.199.84]:37792) by eggs.gnu.org with esmtps (TLS1.2:DHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lD3aL-00011g-1c for qemu-devel@nongnu.org; Fri, 19 Feb 2021 06:04:34 -0500 Received: from [127.0.1.1] (unknown [62.118.151.149]) by mail.ispras.ru (Postfix) with ESMTPSA id C9BA940755C3; Fri, 19 Feb 2021 11:04:22 +0000 (UTC) Subject: [PATCH] tests/acceptance: linux-related tests fix From: Pavel Dovgalyuk To: qemu-devel@nongnu.org Date: Fri, 19 Feb 2021 14:04:22 +0300 Message-ID: <161373266228.1608713.7614311331725780044.stgit@pasha-ThinkPad-X280> User-Agent: StGit/0.23 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=83.149.199.84; envelope-from=pavel.dovgalyuk@ispras.ru; helo=mail.ispras.ru X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: pavel.dovgalyuk@ispras.ru, philmd@redhat.com, wrampazz@redhat.com, crosa@redhat.com, pbonzini@redhat.com, alex.bennee@linaro.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" This patch allows cloudinit images download when ssh key is not specified. Signed-off-by: Pavel Dovgalyuk Reviewed-by: Willian Rampazzo --- tests/acceptance/avocado_qemu/__init__.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/acceptance/avocado_qemu/__init__.py b/tests/acceptance/a= vocado_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=3DNone): try: cloudinit_iso =3D os.path.join(self.workdir, 'cloudinit.iso') self.phone_home_port =3D network.find_free_port() - with open(ssh_pubkey) as pubkey: - pubkey_content =3D pubkey.read() + pubkey_content =3D None + if ssh_pubkey: + with open(ssh_pubkey) as pubkey: + pubkey_content =3D pubkey.read() cloudinit.iso(cloudinit_iso, self.name, username=3D'root', password=3D'password',